diff --git a/app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml b/app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml
index c969979f3da..e8f39fe21fe 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml
@@ -22,7 +22,7 @@
 /**
  * Product list toolbar
  *
- * @see Mage_Catalog_Block_Product_List_Toolbar
+ * @var Mage_Catalog_Block_Product_List_Toolbar $this
  */
 ?>
 <?php if($this->getCollection()->getSize()): ?>
@@ -36,19 +36,20 @@
             <?php endif ?>
         </p>
 
-        <div class="limiter">
-            <label><?php echo $this->__('Show') ?></label>
-            <select onchange="setLocation(this.value)">
-            <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                    <?php echo $_limit ?>
-                </option>
-            <?php endforeach ?>
-            </select> <?php echo $this->__('per page') ?>
-        </div>
-
+        <?php $availableLimits = $this->getAvailableLimit() ?>
+        <?php if (count($availableLimits) > 1): ?>
+            <div class="limiter">
+                <label><?php echo $this->__('Show') ?></label>
+                <select onchange="setLocation(this.value)">
+                <?php foreach ($availableLimits as $_key => $_limit): ?>
+                    <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+                        <?php echo $_limit ?>
+                    </option>
+                <?php endforeach ?>
+                </select> <?php echo $this->__('per page') ?>
+            </div>
+        <?php endif ?>
         <?php echo $this->getPagerHtml() ?>
-
     </div>
 
     <?php if( $this->isExpanded() ): ?>
@@ -58,7 +59,7 @@
             <?php $_modes = $this->getModes(); ?>
             <?php if($_modes && count($_modes)>1): ?>
             <label><?php echo $this->__('View as') ?>:</label>
-            <?php foreach ($this->getModes() as $_code=>$_label): ?>
+            <?php foreach ($this->getModes() as $_code => $_label): ?>
                 <?php if($this->isModeActive($_code)): ?>
                     <strong title="<?php echo $_label ?>" class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></strong>&nbsp;
                 <?php else: ?>
@@ -72,13 +73,13 @@
         <div class="sort-by">
             <label><?php echo $this->__('Sort By') ?></label>
             <select onchange="setLocation(this.value)">
-            <?php foreach($this->getAvailableOrders() as $_key=>$_order): ?>
+            <?php foreach($this->getAvailableOrders() as $_key => $_order): ?>
                 <option value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if($this->isOrderCurrent($_key)): ?> selected="selected"<?php endif ?>>
                     <?php echo $this->__($_order) ?>
                 </option>
             <?php endforeach ?>
             </select>
-            <?php if($this->getCurrentDirection() == 'desc'): ?>
+            <?php if($this->getCurrentDirection() === 'desc'): ?>
                 <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>"><img src="<?php echo $this->getSkinUrl('images/i_desc_arrow.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>" class="v-middle" /></a>
             <?php else: ?>
                 <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>"><img src="<?php echo $this->getSkinUrl('images/i_asc_arrow.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>" class="v-middle" /></a>
diff --git a/app/design/frontend/base/default/template/page/html/pager.phtml b/app/design/frontend/base/default/template/page/html/pager.phtml
index 1010cedb18c..71bf455c2b1 100644
--- a/app/design/frontend/base/default/template/page/html/pager.phtml
+++ b/app/design/frontend/base/default/template/page/html/pager.phtml
@@ -22,7 +22,7 @@
 /**
  * Pager template
  *
- * @see Mage_Page_Block_Html_Pager
+ * @var Mage_Page_Block_Html_Pager $this
  */
 ?>
 <?php if($this->getCollection()->getSize()): ?>
@@ -41,17 +41,18 @@
     </p>
     <?php endif ?>
 
-    <?php if($this->getShowPerPage()): ?>
-    <div class="limiter">
-        <label><?php echo $this->__('Show') ?></label>
-        <select onchange="setLocation(this.value)">
-        <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-            <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                <?php echo $_limit ?>
-            </option>
-        <?php endforeach ?>
-        </select> <?php echo $this->__('per page') ?>
-    </div>
+    <?php $availableLimits = $this->getAvailableLimit() ?>
+    <?php if (count($availableLimits) > 1): ?>
+        <div class="limiter">
+            <label><?php echo $this->__('Show') ?></label>
+            <select onchange="setLocation(this.value)">
+            <?php foreach ($availableLimits as $_key => $_limit): ?>
+                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+                    <?php echo $_limit ?>
+                </option>
+            <?php endforeach ?>
+            </select> <?php echo $this->__('per page') ?>
+        </div>
     <?php endif ?>
 
     <?php if($this->getLastPageNum()>1): ?>
@@ -86,7 +87,6 @@
             <?php endif ?>
         <?php endforeach ?>
 
-
         <?php if ($this->canShowNextJump()): ?>
             <li><a class="next_jump" title="" href="<?php echo $this->getNextJumpUrl() ?>">...</a></li>
         <?php endif ?>
@@ -107,7 +107,6 @@
             </li>
         <?php endif ?>
         </ol>
-
     </div>
     <?php endif ?>
 
diff --git a/app/design/frontend/default/iphone/template/page/html/pager.phtml b/app/design/frontend/default/iphone/template/page/html/pager.phtml
index 94ad83b021b..3413e510faf 100644
--- a/app/design/frontend/default/iphone/template/page/html/pager.phtml
+++ b/app/design/frontend/default/iphone/template/page/html/pager.phtml
@@ -22,7 +22,7 @@
 /**
  * Pager template
  *
- * @see Mage_Page_Block_Html_Pager
+ * @var Mage_Page_Block_Html_Pager $this
  */
 ?>
 <?php if($this->getCollection()->getSize()): ?>
@@ -33,7 +33,6 @@
 
     <?php if($this->getShowAmounts()): ?>
     <p class="amount">
-
         <?php if($this->getLastPageNum()>1): ?>
             <?php echo $this->__('Items %s to %s of %s total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
         <?php else: ?>
@@ -42,17 +41,18 @@
     </p>
     <?php endif ?>
 
-    <?php if($this->getShowPerPage()): ?>
-    <div class="limiter">
-        <label><?php echo $this->__('Show') ?></label>
-        <select onchange="setLocation(this.value)">
-        <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-            <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                <?php echo $_limit ?>
-            </option>
-        <?php endforeach ?>
-        </select> <?php echo $this->__('per page') ?>
-    </div>
+    <?php $availableLimits = $this->getAvailableLimit() ?>
+    <?php if (count($availableLimits) > 1): ?>
+        <div class="limiter">
+            <label><?php echo $this->__('Show') ?></label>
+            <select onchange="setLocation(this.value)">
+            <?php foreach ($availableLimits as $_key => $_limit): ?>
+                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+                    <?php echo $_limit ?>
+                </option>
+            <?php endforeach ?>
+            </select> <?php echo $this->__('per page') ?>
+        </div>
     <?php endif ?>
 
     <?php if($this->getLastPageNum()>1): ?>
@@ -69,7 +69,7 @@
 
             <?php foreach ($this->getFramePages() as $_page): ?>
                 <?php if ($this->isPageCurrent($_page)): ?>
-                    <option value="" class="current" selected="selected"><?php echo $_page ?></li>
+                    <option value="" class="current" selected="selected"><?php echo $_page ?></option>
                 <?php else: ?>
                     <option value="<?php echo $this->getPageUrl($_page) ?>"><?php echo $_page ?></option>
                 <?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml
index 2f39c40f5fa..1cd05c1a622 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml
@@ -22,7 +22,7 @@
 /**
  * Product list toolbar
  *
- * @see Mage_Catalog_Block_Product_List_Toolbar
+ * @var Mage_Catalog_Block_Product_List_Toolbar $this
  */
 ?>
 <?php if($this->getCollection()->getSize()): ?>
@@ -34,7 +34,7 @@
                     <?php $_modes = $this->getModes(); ?>
                     <?php if($_modes && count($_modes)>1): ?>
                         <label><?php echo $this->__('View as') ?></label>
-                        <?php foreach ($this->getModes() as $_code=>$_label): ?>
+                        <?php foreach ($this->getModes() as $_code => $_label): ?>
                             <?php if($this->isModeActive($_code)): ?>
                                 <strong title="<?php echo $_label ?>" class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></strong>
                             <?php else: ?>
@@ -48,13 +48,13 @@
             <div class="sort-by">
                 <label><?php echo $this->__('Sort By') ?></label>
                 <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sort By')) ?>">
-                    <?php foreach($this->getAvailableOrders() as $_key=>$_order): ?>
+                    <?php foreach($this->getAvailableOrders() as $_key => $_order): ?>
                         <option value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if($this->isOrderCurrent($_key)): ?> selected="selected"<?php endif ?>>
                             <?php echo $this->__($_order) ?>
                         </option>
                     <?php endforeach ?>
                 </select>
-                <?php if($this->getCurrentDirection() == 'desc'): ?>
+                <?php if($this->getCurrentDirection() === 'desc'): ?>
                     <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="sort-by-switcher sort-by-switcher--desc" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>"><?php echo $this->__('Set Ascending Direction') ?></a>
                 <?php else: ?>
                     <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="sort-by-switcher sort-by-switcher--asc" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>"><?php echo $this->__('Set Descending Direction') ?></a>
@@ -74,16 +74,19 @@
                 </p>
             <?php endif ?>
 
-            <div class="limiter">
-                <label><?php echo $this->__('Show') ?></label>
-                <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
-                <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-                    <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                        <?php echo $_limit ?>
-                    </option>
-                <?php endforeach ?>
-                </select>
-            </div>
+            <?php $availableLimits = $this->getAvailableLimit() ?>
+            <?php if (count($availableLimits) > 1): ?>
+                <div class="limiter">
+                    <label><?php echo $this->__('Show') ?></label>
+                    <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
+                    <?php foreach ($availableLimits as $_key => $_limit): ?>
+                        <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+                            <?php echo $_limit ?>
+                        </option>
+                    <?php endforeach ?>
+                    </select>
+                </div>
+            <?php endif ?>
         </div>
 
         <?php echo $this->getPagerHtml() ?>
diff --git a/app/design/frontend/rwd/default/template/page/html/pager.phtml b/app/design/frontend/rwd/default/template/page/html/pager.phtml
index 588d03c45db..2d4b92f65e7 100644
--- a/app/design/frontend/rwd/default/template/page/html/pager.phtml
+++ b/app/design/frontend/rwd/default/template/page/html/pager.phtml
@@ -22,7 +22,7 @@
 /**
  * Pager template
  *
- * @see Mage_Page_Block_Html_Pager
+ * @var Mage_Page_Block_Html_Pager $this
  */
 ?>
 <?php if($this->getCollection()->getSize()): ?>
@@ -45,17 +45,18 @@
             <?php endif ?>
         <?php endif ?>
 
-        <?php if($this->getShowPerPage()): ?>
-        <div class="limiter">
-            <label><?php echo $this->__('Show') ?></label>
-            <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
-            <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                    <?php echo $_limit ?>
-                </option>
-            <?php endforeach ?>
-            </select>
-        </div>
+        <?php $availableLimits = $this->getAvailableLimit() ?>
+        <?php if (count($availableLimits) > 1): ?>
+            <div class="limiter">
+                <label><?php echo $this->__('Show') ?></label>
+                <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
+                <?php foreach ($availableLimits as $_key => $_limit): ?>
+                    <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+                        <?php echo $_limit ?>
+                    </option>
+                <?php endforeach ?>
+                </select>
+            </div>
         <?php endif ?>
     </div>
     <?php endif ?>