diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html
index ff8b0d69b..967c63b8d 100644
--- a/templates/default/includes/toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -41,25 +41,11 @@
         <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
             <strong id="pagination-label-{$toolbar}}" class="pagination-label">{intl l="Pagination"}</strong>
             <ul class="pagination">
-
-                {if $product_page > 1}
-                    <li><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
-                {else}
-                    <li><a href="#" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
-                {/if}
+                <li{if $product_page le 1} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
                 {pageloop rel="product_list"}
-                {if $PAGE != $CURRENT}
-                    <li><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
-                {else}
-                    <li class="active"><a href="#" tabindex="-1">{$PAGE}</a></li>
-                {/if}
-                {if $PAGE == $LAST}
-                    {if $CURRENT < $LAST}
-                        <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
-                    {else}
-                        <li><a href="#" title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
-                    {/if}
-
+                    <li{if $PAGE eq $CURRENT} class="active"{/if}><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
+                {if $PAGE eq $LAST}
+                    <li{if $CURRENT eq $LAST} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
                 {/if}
                 {/pageloop}
             </ul>