diff --git a/templates/default/category.html b/templates/default/category.html
index 2434f7c1a..6ad99485c 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -18,7 +18,7 @@
         {$product_page={$smarty.get.page|default:1}}
         {$product_order={$smarty.get.order|default:'alpha'}}
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
-            {include file="includes/category-toolbar.html" toolbar="top" limit=$limit order=$product_order}
+            {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
             <div id="category-products">
                 <div class="products-content">
                     <ul class="product-col-4">
@@ -28,7 +28,7 @@
                     </ul>
                 </div>
             </div><!-- /#category-products -->
-            {include file="includes/category-toolbar.html" toolbar="bottom"}
+            {include file="includes/toolbar.html" toolbar="bottom"}
         </article>
 
         <aside class="col-left" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
diff --git a/templates/default/includes/category-toolbar.html b/templates/default/includes/toolbar.html
similarity index 71%
rename from templates/default/includes/category-toolbar.html
rename to templates/default/includes/toolbar.html
index b3a6c7daa..33f5ba9e5 100644
--- a/templates/default/includes/category-toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -6,11 +6,11 @@
             <span class="limiter">
                 <label for="limit-top">{intl l="Show"}</label>
                 <select id="limit-top" name="limit">
-                    <option value="{url path="{category attr="url"}" limit="4"}" {if $limit==4}selected{/if}>4</option>
-                    <option value="{url path="{category attr="url"}" limit="8"}" {if $limit==8}selected{/if}>8</option>
-                    <option value="{url path="{category attr="url"}" limit="12"}" {if $limit==12}selected{/if}>12</option>
-                    <option value="{url path="{category attr="url"}" limit="50"}"{if $limit==50}selected{/if}>50</option>
-                    <option value="{url path="{category attr="url"}" limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
+                    <option value="{url path={navigate to="current"} limit="4"}" {if $limit==4}selected{/if}>4</option>
+                    <option value="{url path={navigate to="current"} limit="8"}" {if $limit==8}selected{/if}>8</option>
+                    <option value="{url path={navigate to="current"} limit="12"}" {if $limit==12}selected{/if}>12</option>
+                    <option value="{url path={navigate to="current"} limit="50"}"{if $limit==50}selected{/if}>50</option>
+                    <option value="{url path={navigate to="current"} limit="9999999999"}" {if $limit==9999999999}selected{/if}>All</option>
                 </select>
                 <span class="per-page">{intl l="per page"}</span>
             </span><!-- /.limiter -->
@@ -19,10 +19,10 @@
                 <label for="sortby-top">{intl l="Sort By"}</label>
                 <select id="sortby-top" name="sortby">
                     {*<option value="{url path="{category attr="url"}" order="manual"}">{intl l="Position"}</option>*}
-                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha"}" {if $order=="alpha"}selected{/if}>{intl l="Name ascending"}</option>
-                    <option value="{url path="{category attr="url"}" limit=$limit order="alpha_reverse"}" {if $order=="alpha_reverse"}selected{/if}>{intl l="Name descending"}</option>
-                    <option value="{url path="{category attr="url"}" limit=$limit order="min_price"}" {if $order=="min_price"}selected{/if}>{intl l="Price ascending"}</option>
-                    <option value="{url path="{category attr="url"}" limit=$limit order="max_price"}" {if $order=="max_price"}selected{/if}>{intl l="Price descending"}</option>
+                    <option value="{url path={navigate to="current"} limit=$limit order="alpha"}" {if $order=="alpha"}selected{/if}>{intl l="Name ascending"}</option>
+                    <option value="{url path={navigate to="current"} limit=$limit order="alpha_reverse"}" {if $order=="alpha_reverse"}selected{/if}>{intl l="Name descending"}</option>
+                    <option value="{url path={navigate to="current"} limit=$limit order="min_price"}" {if $order=="min_price"}selected{/if}>{intl l="Price ascending"}</option>
+                    <option value="{url path={navigate to="current"} limit=$limit order="max_price"}" {if $order=="max_price"}selected{/if}>{intl l="Price descending"}</option>
                     {*<option value="{url path="{category attr="url"}" order="rating"}">{intl l="Rating"}</option>*}
                 </select>
             </span><!-- /.sort-by -->
@@ -30,7 +30,7 @@
             <span class="view-mode">
                 <span class="view-mode-label">{intl l="View as"}:</span>
                 <span class="view-mode-btn">
-                    <a href="{url path="{navigate to="current"}" mode="grid"}" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
+                    <a href="{url path="{navigate to="current"}" mode='grid'}" data-toggle="view" role="button" class="btn btn-grid"><i class="icon-grid"></i></a>
                     <a href="{url path="{navigate to="current"}" mode="list"}" data-toggle="view" role="button" class="btn btn-list "><i class="icon-list"></i></a>
                 </span>
             </span><!-- /.view-mode -->