From 61666483d6bf122a79f48b852afa24af230dbe81 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date: Thu, 4 May 2023 14:40:22 +0100
Subject: [PATCH 1/6] Fixed price expression SQL in layered navigation (#3227)

---
 .../core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
index a71e588497d..6390996e95a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -309,7 +309,7 @@ public function loadPrices($filter, $limit, $offset = null, $lowerPrice = null,
         if (!is_null($upperPrice)) {
             $select->where("$priceExpression < " . $this->_getComparingValue($upperPrice, $filter));
         }
-        $select->order("$priceExpression ASC")->limit($limit, $offset);
+        $select->order(new Zend_Db_Expr("$priceExpression ASC"))->limit($limit, $offset);
 
         return $this->_getReadAdapter()->fetchCol($select);
     }
@@ -372,7 +372,7 @@ public function loadNextPrices($filter, $price, $rightIndex, $upperPrice = null)
         if (!is_null($upperPrice)) {
             $pricesSelect->where("$priceExpression < " . $this->_getComparingValue($upperPrice, $filter));
         }
-        $pricesSelect->order("$priceExpression DESC")->limit($rightIndex - $offset + 1, $offset - 1);
+        $pricesSelect->order(new Zend_Db_Expr("$priceExpression DESC"))->limit($rightIndex - $offset + 1, $offset - 1);
 
         return array_reverse($this->_getReadAdapter()->fetchCol($pricesSelect));
     }

From e56ab9012310ac7a18c3422d44b846bc4ec00377 Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date: Sun, 7 May 2023 21:33:59 +0100
Subject: [PATCH 2/6] Fixed stock status update from SOAP API V2 (#1635)

---
 .../Mage/CatalogInventory/Model/Stock/Item/Api/V2.php    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
index c2361371878..d2d14d0ea59 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
@@ -35,14 +35,15 @@ public function update($productId, $data)
         $idBySku = $product->getIdBySku($productId);
         $productId = $idBySku ? $idBySku : $productId;
 
-        $product->setStoreId($this->_getStoreId())
-            ->load($productId);
+        /** @var Mage_CatalogInventory_Model_Stock_Item $stockItem */
+        $stockItem = Mage::getModel('cataloginventory/stock_item')
+            ->setStoreId($this->_getStoreId())
+            ->loadByProduct($productId);
 
-        if (!$product->getId()) {
+        if (!$stockItem->getId()) {
             $this->_fault('not_exists');
         }
 
-        $stockItem = $product->getStockItem();
         $stockData = array_replace($stockItem->getData(), (array)$data);
         $stockItem->setData($stockData);
 

From 73d4f483410486c96c5db1ad39f5eed84927423d Mon Sep 17 00:00:00 2001
From: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date: Tue, 9 May 2023 15:48:13 +0100
Subject: [PATCH 3/6] Load all child blocks in Adminhtml Head block (#3222)

---
 app/design/adminhtml/default/default/template/page/head.phtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/default/default/template/page/head.phtml
index 1a00c95d647..84106be7256 100644
--- a/app/design/adminhtml/default/default/template/page/head.phtml
+++ b/app/design/adminhtml/default/default/template/page/head.phtml
@@ -50,5 +50,4 @@
 </script>
 
 <?php echo $this->helper('core/js')->getTranslatorScript() ?>
-<?php echo $this->getChildHtml('calendar'); ?>
-<?php echo $this->getChildHtml('optional_zip_countries'); ?>
+<?php echo $this->getChildHtml(); ?>

From a7413b8195ac77ee9087ed3770b2703daf86eb2c Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Tue, 9 May 2023 17:19:59 +0100
Subject: [PATCH 4/6] Removed double span element from HTML buttons (#3123)

---
 .../base/default/template/catalog/msrp/popup.phtml        | 2 +-
 .../default/template/catalog/product/compare/list.phtml   | 6 +++---
 .../template/catalog/product/compare/sidebar.phtml        | 2 +-
 .../base/default/template/catalog/product/list.phtml      | 4 ++--
 .../base/default/template/catalog/product/new.phtml       | 2 +-
 .../default/template/catalog/product/view/addtocart.phtml | 2 +-
 .../catalog/product/widget/new/content/new_grid.phtml     | 2 +-
 .../catalog/product/widget/new/content/new_list.phtml     | 2 +-
 .../default/template/catalogsearch/advanced/form.phtml    | 2 +-
 .../base/default/template/catalogsearch/form.mini.phtml   | 2 +-
 .../frontend/base/default/template/checkout/cart.phtml    | 6 +++---
 .../base/default/template/checkout/cart/coupon.phtml      | 4 ++--
 .../base/default/template/checkout/cart/crosssell.phtml   | 2 +-
 .../checkout/cart/item/configure/updatecart.phtml         | 2 +-
 .../base/default/template/checkout/cart/shipping.phtml    | 4 ++--
 .../base/default/template/checkout/cart/sidebar.phtml     | 2 +-
 .../template/checkout/multishipping/address/select.phtml  | 2 +-
 .../template/checkout/multishipping/addresses.phtml       | 6 +++---
 .../default/template/checkout/multishipping/billing.phtml | 2 +-
 .../template/checkout/multishipping/overview.phtml        | 2 +-
 .../template/checkout/multishipping/shipping.phtml        | 2 +-
 .../default/template/checkout/multishipping/success.phtml | 2 +-
 .../base/default/template/checkout/onepage/billing.phtml  | 2 +-
 .../base/default/template/checkout/onepage/link.phtml     | 2 +-
 .../base/default/template/checkout/onepage/login.phtml    | 4 ++--
 .../base/default/template/checkout/onepage/payment.phtml  | 2 +-
 .../default/template/checkout/onepage/review/button.phtml | 2 +-
 .../base/default/template/checkout/onepage/shipping.phtml | 2 +-
 .../template/checkout/onepage/shipping_method.phtml       | 2 +-
 .../frontend/base/default/template/checkout/success.phtml | 2 +-
 .../frontend/base/default/template/contacts/form.phtml    | 2 +-
 .../frontend/base/default/template/customer/address.phtml | 2 +-
 .../base/default/template/customer/address/book.phtml     | 2 +-
 .../base/default/template/customer/address/edit.phtml     | 2 +-
 .../base/default/template/customer/form/address.phtml     | 2 +-
 .../default/template/customer/form/changepassword.phtml   | 2 +-
 .../default/template/customer/form/confirmation.phtml     | 2 +-
 .../base/default/template/customer/form/edit.phtml        | 2 +-
 .../default/template/customer/form/forgotpassword.phtml   | 2 +-
 .../base/default/template/customer/form/login.phtml       | 4 ++--
 .../base/default/template/customer/form/mini.login.phtml  | 2 +-
 .../base/default/template/customer/form/newsletter.phtml  | 2 +-
 .../base/default/template/customer/form/register.phtml    | 2 +-
 .../template/customer/form/resetforgottenpassword.phtml   | 2 +-
 .../base/default/template/newsletter/subscribe.phtml      | 2 +-
 .../default/template/oauth/authorize/button-simple.phtml  | 4 ++--
 .../base/default/template/oauth/authorize/button.phtml    | 6 ++++--
 .../default/template/oauth/authorize/confirm-simple.phtml | 2 +-
 .../default/template/oauth/authorize/form/login.phtml     | 4 ++--
 .../default/template/oauth/authorize/reject-simple.phtml  | 2 +-
 .../base/default/template/page/html/cookienotice.phtml    | 2 +-
 .../frontend/base/default/template/page/print.phtml       | 2 +-
 .../frontend/base/default/template/paygate/form/cc.phtml  | 2 +-
 .../base/default/template/paypal/express/review.phtml     | 6 +++---
 .../base/default/template/paypal/hss/review/button.phtml  | 2 +-
 .../template/persistent/checkout/onepage/billing.phtml    | 2 +-
 .../template/persistent/checkout/onepage/login.phtml      | 8 ++++----
 .../default/template/persistent/customer/form/login.phtml | 4 ++--
 .../template/persistent/customer/form/register.phtml      | 2 +-
 .../default/template/reports/home_product_compared.phtml  | 2 +-
 .../default/template/reports/home_product_viewed.phtml    | 2 +-
 .../reports/widget/compared/content/compared_grid.phtml   | 2 +-
 .../reports/widget/compared/content/compared_list.phtml   | 2 +-
 .../reports/widget/viewed/content/viewed_grid.phtml       | 2 +-
 .../reports/widget/viewed/content/viewed_list.phtml       | 2 +-
 .../frontend/base/default/template/review/form.phtml      | 2 +-
 .../default/template/sales/billing/agreement/view.phtml   | 2 +-
 .../base/default/template/sales/billing/agreements.phtml  | 2 +-
 .../frontend/base/default/template/sales/guest/form.phtml | 2 +-
 .../base/default/template/sales/order/details.phtml       | 2 +-
 .../default/template/sales/recurring/profile/view.phtml   | 8 ++++----
 .../base/default/template/sales/reorder/sidebar.phtml     | 2 +-
 .../base/default/template/sales/widget/guest/form.phtml   | 2 +-
 .../frontend/base/default/template/sendfriend/send.phtml  | 4 ++--
 .../base/default/template/shipping/tracking/popup.phtml   | 4 ++--
 .../base/default/template/tag/customer/view.phtml         | 2 +-
 .../base/default/template/wishlist/button/share.phtml     | 2 +-
 .../base/default/template/wishlist/button/tocart.phtml    | 2 +-
 .../base/default/template/wishlist/button/update.phtml    | 2 +-
 .../base/default/template/wishlist/item/column/cart.phtml | 2 +-
 .../frontend/base/default/template/wishlist/shared.phtml  | 4 ++--
 .../frontend/base/default/template/wishlist/sharing.phtml | 2 +-
 82 files changed, 110 insertions(+), 108 deletions(-)

diff --git a/app/design/frontend/base/default/template/catalog/msrp/popup.phtml b/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
index 08e4ae35a12..b27281eb7b7 100644
--- a/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
+++ b/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
@@ -31,7 +31,7 @@
                 <div class="additional-addtocart-box">
                     <?php echo $this->getChildHtml(); ?>
                 </div>
-                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><?php echo $this->__('Add to Cart') ?></button>
             </form>
         </div>
         <div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo $this->__('Price'); ?>:</strong> <span style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
diff --git a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
index 8bab693fc52..003adc4b6c1 100644
--- a/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/compare/list.phtml
@@ -64,7 +64,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
                                         '<?php echo $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
@@ -135,7 +135,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
                                             '<?php echo $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
                                             '<?php echo $_params ?>',
                                             'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         </p>
                     <?php else: ?>
@@ -161,7 +161,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
         </tbody>
     </table>
     <div class="buttons-set">
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><?php echo $this->__('Close Window') ?></button>
         <span class="please-wait" id="compare-list-please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Please wait...')) ?>" title="<?php echo $this->__('Please wait...') ?>" class="v-middle" /> <?php echo $this->__('Please wait...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml b/app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml
index 2d4526e2886..5fbc783c479 100644
--- a/app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml
@@ -41,7 +41,7 @@ $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
         <script type="text/javascript">decorateList('compare-items')</script>
         <div class="actions">
             <a href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you would like to remove all products from your comparison?')) ?>');"><?php echo $this->__('Clear All') ?></a>
-            <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
+            <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><?php echo $this->__('Compare') ?></button>
         </div>
     <?php else: ?>
         <p class="empty"><?php echo $this->__('You have no items to compare.') ?></p>
diff --git a/app/design/frontend/base/default/template/catalog/product/list.phtml b/app/design/frontend/base/default/template/catalog/product/list.phtml
index 6f739312a08..32acf3eb1dd 100644
--- a/app/design/frontend/base/default/template/catalog/product/list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list.phtml
@@ -55,7 +55,7 @@
                                     title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>"
                                     class="button btn-cart"
                                     onclick="customFormSubmit('<?php echo $_cartUrl ?>', '<?php echo $_params ?>', 'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         </p>
                     <?php else: ?>
@@ -120,7 +120,7 @@
                                 title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>"
                                 class="button btn-cart"
                                 onclick="customFormSubmit('<?php echo $_cartUrl ?>', '<?php echo $_params ?>', 'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/catalog/product/new.phtml b/app/design/frontend/base/default/template/catalog/product/new.phtml
index f786fce0227..3aad13afd3d 100644
--- a/app/design/frontend/base/default/template/catalog/product/new.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/new.phtml
@@ -35,7 +35,7 @@
                                         '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
index bc43f2fbdd2..b045a86c312 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
@@ -21,7 +21,7 @@
         <label for="qty"><?php echo $this->__('Qty:') ?></label>
         <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
         <?php endif ?>
-        <button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
+        <button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?php echo $buttonTitle ?></button>
         <?php echo $this->getChildHtml('', true, true) ?>
     </div>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
index 735d783ac55..0d97243eb7a 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -40,7 +40,7 @@
                                         '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
index c5db8f99126..ad92b9caf14 100644
--- a/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
@@ -38,7 +38,7 @@
                                             '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                             '<?php echo $_params ?>',
                                             'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         <?php else: ?>
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml b/app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml
index ac4a2b5ae14..5a00dfcdb90 100644
--- a/app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml
@@ -75,7 +75,7 @@
         <script type="text/javascript">decorateList('advanced-search-list')</script>
     </div>
     <div class="buttons-set">
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><?php echo $this->__('Search') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
index f1fc5166679..14b078c83b2 100644
--- a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
@@ -19,7 +19,7 @@ $catalogSearchHelper =  $this->helper('catalogsearch');
     <div class="form-search">
         <label for="search"><?php echo $this->__('Search:') ?></label>
         <input id="search" type="text" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" />
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><?php echo $this->__('Search') ?></button>
         <div id="search_autocomplete" class="search-autocomplete"></div>
         <script type="text/javascript">
         //<![CDATA[
diff --git a/app/design/frontend/base/default/template/checkout/cart.phtml b/app/design/frontend/base/default/template/checkout/cart.phtml
index 25ea9ecd748..006e9a3024f 100644
--- a/app/design/frontend/base/default/template/checkout/cart.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart.phtml
@@ -87,10 +87,10 @@
                     <tr>
                         <td colspan="50" class="a-right">
                             <?php if($this->getContinueShoppingUrl()): ?>
-                                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
+                                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><?php echo $this->__('Continue Shopping') ?></button>
                             <?php endif ?>
-                            <button type="submit" name="update_cart_action"  value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
-                            <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Clear Shopping Cart'); ?></span></span></button>
+                            <button type="submit" name="update_cart_action"  value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><?php echo $this->__('Update Shopping Cart'); ?></button>
+                            <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><?php echo $this->__('Clear Shopping Cart'); ?></button>
                         </td>
                     </tr>
                 </tfoot>
diff --git a/app/design/frontend/base/default/template/checkout/cart/coupon.phtml b/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
index f864ae76316..4e4d490d5b7 100644
--- a/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/coupon.phtml
@@ -25,9 +25,9 @@
                 <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
             </div>
             <div class="buttons-set">
-                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>
+                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>"><?php echo $this->__('Apply Coupon') ?></button>
                 <?php if(strlen($this->getCouponCode())): ?>
-                    &nbsp; <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>"><span><span><?php echo $this->__('Cancel Coupon') ?></span></span></button>
+                    &nbsp; <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>"><?php echo $this->__('Cancel Coupon') ?></button>
                 <?php endif ?>
             </div>
         </div>
diff --git a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
index 3b5d9564f8f..eead0fcfa1a 100644
--- a/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
@@ -38,7 +38,7 @@
                                 '<?php echo $this->getAddToCartUrlCustom($_item, [], false) ?>',
                                 '<?php echo $_params ?>',
                                 'post')">
-                    <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                    <?php echo $this->__('Add to Cart') ?>
                 </button>
                 <ul class="add-to-links">
                     <?php if ($this->helper('wishlist')->isAllow()) : ?>
diff --git a/app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml b/app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml
index d3f7f6df9fd..07651d42bdc 100644
--- a/app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml
@@ -22,7 +22,7 @@
         <label for="qty"><?php echo $this->__('Qty:') ?></label>
         <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
         <?php endif ?>
-        <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
+        <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?php echo $buttonTitle ?></button>
         <?php echo $this->getChildHtml('', true, true) ?>
     </div>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/checkout/cart/shipping.phtml b/app/design/frontend/base/default/template/checkout/cart/shipping.phtml
index 7a55726e602..5b2e264390f 100644
--- a/app/design/frontend/base/default/template/checkout/cart/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/shipping.phtml
@@ -58,7 +58,7 @@
                 </li>
             </ul>
             <div class="buttons-set">
-                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get a Quote')) ?>" onclick="coShippingMethodForm.submit()" class="button"><span><span><?php echo $this->__('Get a Quote') ?></span></span></button>
+                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get a Quote')) ?>" onclick="coShippingMethodForm.submit()" class="button"><?php echo $this->__('Get a Quote') ?></button>
             </div>
         </form>
         <script type="text/javascript">
@@ -96,7 +96,7 @@
                 <?php endforeach ?>
             </dl>
             <div class="buttons-set">
-                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>"><span><span><?php echo $this->__('Update Total') ?></span></span></button>
+                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>"><?php echo $this->__('Update Total') ?></button>
             </div>
             <?php echo $this->getBlockHtml('formkey') ?>
         </form>
diff --git a/app/design/frontend/base/default/template/checkout/cart/sidebar.phtml b/app/design/frontend/base/default/template/checkout/cart/sidebar.phtml
index 4c35296f9d7..fba6f961e85 100644
--- a/app/design/frontend/base/default/template/checkout/cart/sidebar.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/sidebar.phtml
@@ -49,7 +49,7 @@
     <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
     <div class="actions">
         <?php echo $this->getChildHtml('extra_actions') ?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><span><span><?php echo $this->__('Checkout') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><?php echo $this->__('Checkout') ?></button>
     </div>
     <?php endif ?>
     <?php $_items = $this->getRecentItems() ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml b/app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml
index 2238f4e982a..208bbe2df2d 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml
@@ -16,7 +16,7 @@
 <div class="multiple-checkout">
     <div class="page-title title-buttons">
         <h1><?php echo $this->__('Change Billing Address') ?></h1>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><?php echo $this->__('Add New Address') ?></button>
     </div>
     <?php echo $this->getMessagesBlock()->toHtml() ?>
     <?php $_index=0 ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml b/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
index 4dab30c183f..efff1e262d1 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml
@@ -25,7 +25,7 @@
     <div class="multiple-checkout">
         <div class="page-title title-buttons">
             <h1><?php echo $this->__('Ship to Multiple Addresses') ?></h1>
-            <button data-action="add-new-customer-address" type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Enter a New Address')) ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><span><span><?php echo $this->__('Enter a New Address') ?></span></span></button>
+            <button data-action="add-new-customer-address" type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Enter a New Address')) ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><?php echo $this->__('Enter a New Address') ?></button>
         </div>
         <input type="hidden" name="continue" value="0" id="can_continue_flag" />
         <input type="hidden" name="new_address" value="0" id="add_new_address_flag" />
@@ -49,7 +49,7 @@
                           data-multiship-item-update
                           title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Qty &amp; Addresses')) ?>"
                           class="button" onclick="$('can_continue_flag').value=0">
-                            <span><span><?php echo $this->__('Update Qty &amp; Addresses') ?></span></span>
+                            <?php echo $this->__('Update Qty &amp; Addresses') ?>
                         </button>
                     </td>
                 </tr>
@@ -70,7 +70,7 @@
         <script type="text/javascript">decorateTable('multiship-addresses-table')</script>
         <div class="buttons-set">
             <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shopping Cart') ?></a></p>
-            <button type="submit" data-action="checkout-continue-shipping" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Shipping Information')) ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif ?>" onclick="$('can_continue_flag').value=1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif ?>><span><span><?php echo $this->__('Continue to Shipping Information') ?></span></span></button>
+            <button type="submit" data-action="checkout-continue-shipping" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Shipping Information')) ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif ?>" onclick="$('can_continue_flag').value=1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif ?>><?php echo $this->__('Continue to Shipping Information') ?></button>
         </div>
     </div>
     <?php echo $this->getBlockHtml("formkey") ?>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
index 589f526749e..b306407a9bc 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
@@ -78,7 +78,7 @@
         </div>
         <div class="buttons-set">
             <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shipping Information') ?></a></p>
-            <button id="payment-continue" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Review Your Order')) ?>" class="button"><span><span><?php echo $this->__('Continue to Review Your Order') ?></span></span></button>
+            <button id="payment-continue" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Review Your Order')) ?>" class="button"><?php echo $this->__('Continue to Review Your Order') ?></button>
         </div>
         <?php echo $this->getBlockHtml('formkey') ?>
     </form>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/overview.phtml b/app/design/frontend/base/default/template/checkout/multishipping/overview.phtml
index c4eef5c34ff..506932ab6ca 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/overview.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/overview.phtml
@@ -186,7 +186,7 @@
                         <div class="inner">
                             <big><?php echo $this->__('Grand Total:') ?> <?php echo $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
                             <div id="review-buttons-container">
-                                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
+                                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><?php echo $this->__('Place Order') ?></button>
                             </div>
                         </div>
                     </div>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
index 97668f6e538..ff8bb728876 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
@@ -113,7 +113,7 @@
         <?php echo $this->getChildHtml('checkout_billing_items') ?>
         <div class="buttons-set">
             <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Select Addresses') ?></a></p>
-            <button data-action="checkout-continue-billing" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Billing Information')) ?>" class="button"><span><span><?php echo $this->__('Continue to Billing Information') ?></span></span></button>
+            <button data-action="checkout-continue-billing" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Billing Information')) ?>" class="button"><?php echo $this->__('Continue to Billing Information') ?></button>
         </div>
         <?php echo $this->getBlockHtml('formkey') ?>
     </form>
diff --git a/app/design/frontend/base/default/template/checkout/multishipping/success.phtml b/app/design/frontend/base/default/template/checkout/multishipping/success.phtml
index afc5a7bc10d..cd7591080e7 100644
--- a/app/design/frontend/base/default/template/checkout/multishipping/success.phtml
+++ b/app/design/frontend/base/default/template/checkout/multishipping/success.phtml
@@ -34,6 +34,6 @@
     <?php endif ?>
     <?php echo $this->getChildHtml() ?>
     <div class="buttons-set">
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><?php echo $this->__('Continue Shopping') ?></button>
     </div>
 </div>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
index 6a67bc7d305..8bd78fbcaa9 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
@@ -199,7 +199,7 @@
     <?php endif ?>
     <div class="buttons-set" id="billing-buttons-container">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><?php echo $this->__('Continue') ?></button>
         <span class="please-wait" id="billing-please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/link.phtml b/app/design/frontend/base/default/template/checkout/onepage/link.phtml
index 973faeb213b..32520f1d2f2 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/link.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/link.phtml
@@ -14,5 +14,5 @@
  */
 ?>
 <?php if ($this->isPossibleOnepageCheckout()):?>
-    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Proceed to Checkout')) ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
+    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Proceed to Checkout')) ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><?php echo $this->__('Proceed to Checkout') ?></button>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
index ee9b0762eff..240c047e046 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
@@ -81,14 +81,14 @@
     <div class="col-1">
         <div class="buttons-set">
             <p class="required">&nbsp;</p>
-            <button type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo ($this->getQuote()->isAllowedGuestCheckout() ? $this->__('Continue') : $this->__('Register')) ?></span></span></button>
+            <button type="button" class="button" onclick="checkout.setMethod();"><?php echo ($this->getQuote()->isAllowedGuestCheckout() ? $this->__('Continue') : $this->__('Register')) ?></button>
         </div>
     </div>
     <div class="col-2">
         <div class="buttons-set">
             <p class="required"><?php echo $this->__('* Required Fields') ?></p>
             <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
-            <button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
+            <button type="submit" class="button" onclick="onepageLogin(this)"><?php echo $this->__('Login') ?></button>
         </div>
     </div>
 </div>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/payment.phtml b/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
index b01255acafc..c28d7c06dec 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
@@ -35,7 +35,7 @@
 <div class="buttons-set" id="payment-buttons-container">
     <p class="required"><?php echo $this->__('* Required Fields') ?></p>
     <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-    <button type="button" class="button" onclick="payment.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+    <button type="button" class="button" onclick="payment.save()"><?php echo $this->__('Continue') ?></button>
     <span class="please-wait" id="payment-please-wait" style="display:none;">
         <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
     </span>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
index b9106c2003b..b183d7d0ba0 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
@@ -12,4 +12,4 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
+<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" onclick="review.save();"><?php echo $this->__('Place Order') ?></button>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
index 5882f83d7bd..4ce0bc5ec67 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
@@ -130,7 +130,7 @@
     <div class="buttons-set" id="shipping-buttons-container">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+        <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><?php echo $this->__('Continue') ?></button>
         <span id="shipping-please-wait" class="please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
index 07bb78aca70..e5b7803a448 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
@@ -26,7 +26,7 @@
     </div>
     <div class="buttons-set" id="shipping-method-buttons-container">
         <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button type="button" class="button" onclick="shippingMethod.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+        <button type="button" class="button" onclick="shippingMethod.save()"><?php echo $this->__('Continue') ?></button>
         <span id="shipping-method-please-wait" class="please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/checkout/success.phtml b/app/design/frontend/base/default/template/checkout/success.phtml
index f24bd13efb5..465642f8519 100644
--- a/app/design/frontend/base/default/template/checkout/success.phtml
+++ b/app/design/frontend/base/default/template/checkout/success.phtml
@@ -49,5 +49,5 @@
 <?php endif ?>
 
 <div class="buttons-set">
-    <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
+    <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><?php echo $this->__('Continue Shopping') ?></button>
 </div>
diff --git a/app/design/frontend/base/default/template/contacts/form.phtml b/app/design/frontend/base/default/template/contacts/form.phtml
index 25e37672274..97f6c648594 100644
--- a/app/design/frontend/base/default/template/contacts/form.phtml
+++ b/app/design/frontend/base/default/template/contacts/form.phtml
@@ -52,7 +52,7 @@
     </div>
     <div class="buttons-set">
         <p class="required"><?php echo Mage::helper('contacts')->__('* Required Fields') ?></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><span><span><?php echo Mage::helper('contacts')->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><?php echo Mage::helper('contacts')->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/address.phtml b/app/design/frontend/base/default/template/customer/address.phtml
index 08e92db4ac2..48d0dd7365e 100644
--- a/app/design/frontend/base/default/template/customer/address.phtml
+++ b/app/design/frontend/base/default/template/customer/address.phtml
@@ -71,7 +71,7 @@
 </table>
 <div class="buttons-set">
     <p class="back-link"><a href="<?php echo $this->getUrl('customer/account/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-    <button type="button" onclick="window.location='<?php echo $this->getUrl('customer/address/form') ?>';" class="button"><span><span><?php echo $this->__('New Address') ?></span></span></button>
+    <button type="button" onclick="window.location='<?php echo $this->getUrl('customer/address/form') ?>';" class="button"><?php echo $this->__('New Address') ?></button>
 </div>
 <script type="text/javascript">
     function deleteAddress(addressId) {
diff --git a/app/design/frontend/base/default/template/customer/address/book.phtml b/app/design/frontend/base/default/template/customer/address/book.phtml
index b9a33f2f443..2023328aa51 100644
--- a/app/design/frontend/base/default/template/customer/address/book.phtml
+++ b/app/design/frontend/base/default/template/customer/address/book.phtml
@@ -21,7 +21,7 @@
 ?>
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('Address Book') ?></h1>
-    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
+    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><?php echo $this->__('Add New Address') ?></button>
 </div>
 <?php echo $this->getMessagesBlock()->toHtml() ?>
 <div class="col2-set addresses-list">
diff --git a/app/design/frontend/base/default/template/customer/address/edit.phtml b/app/design/frontend/base/default/template/customer/address/edit.phtml
index 70ec3b7627e..c54cec61daa 100644
--- a/app/design/frontend/base/default/template/customer/address/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/address/edit.phtml
@@ -143,7 +143,7 @@
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button data-action="save-customer-address" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
+        <button data-action="save-customer-address" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><?php echo $this->__('Save Address') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/address.phtml b/app/design/frontend/base/default/template/customer/form/address.phtml
index b46b00c42c5..e331ea4f6e6 100644
--- a/app/design/frontend/base/default/template/customer/form/address.phtml
+++ b/app/design/frontend/base/default/template/customer/form/address.phtml
@@ -120,7 +120,7 @@
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button data-action="save-customer-address" type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
+        <button data-action="save-customer-address" type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><?php echo $this->__('Save Address') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/changepassword.phtml b/app/design/frontend/base/default/template/customer/form/changepassword.phtml
index e4c31680e06..2c96d81f42a 100644
--- a/app/design/frontend/base/default/template/customer/form/changepassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/changepassword.phtml
@@ -54,7 +54,7 @@
 <div class="buttons-set">
     <p class="required"><?php echo $this->__('* Required Fields') ?></p>
     <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-    <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Password')) ?>" class="button"><span><span><?php echo $this->__('Save Password') ?></span></span></button>
+    <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Password')) ?>" class="button"><?php echo $this->__('Save Password') ?></button>
 </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/confirmation.phtml b/app/design/frontend/base/default/template/customer/form/confirmation.phtml
index c46c13c7e93..9c684539553 100644
--- a/app/design/frontend/base/default/template/customer/form/confirmation.phtml
+++ b/app/design/frontend/base/default/template/customer/form/confirmation.phtml
@@ -32,7 +32,7 @@
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?php echo $this->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/edit.phtml b/app/design/frontend/base/default/template/customer/form/edit.phtml
index 597c3dcb016..85856c49c12 100644
--- a/app/design/frontend/base/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/form/edit.phtml
@@ -87,7 +87,7 @@
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><?php echo $this->__('Save') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
index bbc49b9c325..36d105f60d9 100644
--- a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
@@ -33,7 +33,7 @@
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?php echo $this->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/login.phtml b/app/design/frontend/base/default/template/customer/form/login.phtml
index 88003f0a2fe..84ec78f3db9 100644
--- a/app/design/frontend/base/default/template/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/customer/form/login.phtml
@@ -62,13 +62,13 @@
         <div class="col2-set">
             <div class="col-1 new-users">
                 <div class="buttons-set">
-                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
+                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><?php echo $this->__('Create an Account') ?></button>
                 </div>
             </div>
             <div class="col-2 registered-users">
                 <div class="buttons-set">
                     <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
-                    <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
+                    <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><?php echo $this->__('Login') ?></button>
                 </div>
             </div>
         </div>
diff --git a/app/design/frontend/base/default/template/customer/form/mini.login.phtml b/app/design/frontend/base/default/template/customer/form/mini.login.phtml
index 8c3a0d3a588..69b3830a9b8 100644
--- a/app/design/frontend/base/default/template/customer/form/mini.login.phtml
+++ b/app/design/frontend/base/default/template/customer/form/mini.login.phtml
@@ -29,7 +29,7 @@
             <label for="mini-login"><?php echo $this->__('Email:') ?></label><input type="text" name="login[username]" id="mini-login" class="input-text" />
             <label for="mini-password"><?php echo $this->__('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" autocomplete="off" />
             <div class="actions">
-                <button type="submit" class="button"><span><span><?php echo $this->__('Login') ?></span></span></button>
+                <button type="submit" class="button"><?php echo $this->__('Login') ?></button>
             </div>
         </div>
     </form>
diff --git a/app/design/frontend/base/default/template/customer/form/newsletter.phtml b/app/design/frontend/base/default/template/customer/form/newsletter.phtml
index a8dfd8b4877..a1f34d67092 100644
--- a/app/design/frontend/base/default/template/customer/form/newsletter.phtml
+++ b/app/design/frontend/base/default/template/customer/form/newsletter.phtml
@@ -30,7 +30,7 @@
     </div>
     <div class="buttons-set">
         <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><?php echo $this->__('Save') ?></button>
     </div>
 </form>
 <?php /* Extensions placeholder */ ?>
diff --git a/app/design/frontend/base/default/template/customer/form/register.phtml b/app/design/frontend/base/default/template/customer/form/register.phtml
index e5bf4eabf6c..fd9ca32edd4 100644
--- a/app/design/frontend/base/default/template/customer/form/register.phtml
+++ b/app/design/frontend/base/default/template/customer/form/register.phtml
@@ -175,7 +175,7 @@
         <div class="buttons-set">
             <p class="required"><?php echo $this->__('* Required Fields') ?></p>
             <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-            <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
+            <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?php echo $this->__('Submit') ?></button>
         </div>
     </form>
     <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml b/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
index 8ae84d4afa2..1b381802d45 100644
--- a/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
@@ -46,7 +46,7 @@
     </div>
     <div class="buttons-set">
         <p class="required"><?php echo $this->__('* Required Fields'); ?></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Reset a Password')); ?>" class="button"><span><span><?php echo $this->__('Reset a Password'); ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Reset a Password')); ?>" class="button"><?php echo $this->__('Reset a Password'); ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/newsletter/subscribe.phtml b/app/design/frontend/base/default/template/newsletter/subscribe.phtml
index bedc55113d2..935dbee0e58 100644
--- a/app/design/frontend/base/default/template/newsletter/subscribe.phtml
+++ b/app/design/frontend/base/default/template/newsletter/subscribe.phtml
@@ -27,7 +27,7 @@
                <input type="text" name="email" id="newsletter" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sign up for our newsletter')) ?>" class="input-text required-entry validate-email" />
             </div>
             <div class="actions">
-                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><span><span><?php echo $this->__('Subscribe') ?></span></span></button>
+                <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><?php echo $this->__('Subscribe') ?></button>
             </div>
         </div>
     </form>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
index 88b95aaf2a1..95c74ef4dfd 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml
@@ -37,12 +37,12 @@ $logo = $this->getSkinUrl('images/logo-large.gif', ['_area' => 'adminhtml', '_pa
                     <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
                         <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
                         <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>">
-                            <span><span><?php echo $this->__('Authorize') ?></span></span></button>
+                            <?php echo $this->__('Authorize') ?></button>
                     </form>
                     <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
                         <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
                         <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
-                            <span><span><?php echo $this->__('Reject') ?></span></span></button>
+                            <?php echo $this->__('Reject') ?></button>
                     </form>
                 <?php endif ?>
             </div>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/button.phtml b/app/design/frontend/base/default/template/oauth/authorize/button.phtml
index e48cb32de4b..2f75f5a0951 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/button.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/button.phtml
@@ -30,12 +30,14 @@
         <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
             <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
             <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>" name="authorize">
-                <span><span><?php echo $this->__('Authorize') ?></span></span></button>
+                <?php echo $this->__('Authorize') ?>
+            </button>
         </form>
         <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
             <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
             <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
-                <span><span><?php echo $this->__('Reject') ?></span></span></button>
+                <?php echo $this->__('Reject') ?>
+            </button>
         </form>
     <?php endif ?>
 
diff --git a/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml
index 87aac6b90d6..335c809ca59 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml
@@ -34,7 +34,7 @@
             <button type="submit" class="button"
                     onclick="window.close();"
                     title="<?php echo $this->__('Close') ?>">
-                <span><span><?php echo $this->__('Close') ?></span></span>
+                <?php echo $this->__('Close') ?>
             </button>
         </div>
     </div>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
index f1dad7c3096..72cc134c706 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
@@ -47,10 +47,10 @@ $rejectJs = "document.location.href='{$this->getRejectUrl()}';";
                         </ul>
                         <div class="buttons-set" style="margin-top: 20px; padding: 0;">
                             <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2">
-                                <span><span><?php echo $this->__('Login') ?></span></span></button>
+                                <?php echo $this->__('Login') ?></button>
                             <button type="submit" class="button" onclick="<?php echo $rejectJs; ?>"
                                     title="<?php echo $this->__('Reject') ?>" name="send">
-                                <span><span><?php echo $this->__('Reject') ?></span></span></button>
+                                <?php echo $this->__('Reject') ?></button>
                         </div>
                     </div>
                 </div>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml
index adedf189f2f..04ccbb81692 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml
@@ -28,7 +28,7 @@
                 <?php echo $this->getMessagesBlock()->toHtml() ?>
             </div>
             <button type="submit" class="button" onclick="window.close();" title="<?php echo $this->__('Close') ?>">
-                <span><span><?php echo $this->__('Close') ?></span></span>
+                <?php echo $this->__('Close') ?>
             </button>
         </div>
     </div>
diff --git a/app/design/frontend/base/default/template/page/html/cookienotice.phtml b/app/design/frontend/base/default/template/page/html/cookienotice.phtml
index 0e355f22aae..e1e1e43bf32 100644
--- a/app/design/frontend/base/default/template/page/html/cookienotice.phtml
+++ b/app/design/frontend/base/default/template/page/html/cookienotice.phtml
@@ -22,7 +22,7 @@
 <div class="global-site-notice notice-cookie" id="notice-cookie-block">
     <div class="notice-inner">
         <div class="notice-text"><?php echo $this->getCookieRestrictionBlockContent(); ?></div>
-        <div class="actions"><button class="button" onclick="allowSaveCookie()"><span><span><?php echo $this->__('Allow');?></span></span></button></div>
+        <div class="actions"><button class="button" onclick="allowSaveCookie()"><?php echo $this->__('Allow');?></button></div>
     </div>
 </div>
 <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/page/print.phtml b/app/design/frontend/base/default/template/page/print.phtml
index 5598fde6590..93c5fbadc38 100644
--- a/app/design/frontend/base/default/template/page/print.phtml
+++ b/app/design/frontend/base/default/template/page/print.phtml
@@ -33,7 +33,7 @@
     </div>
     <?php echo $this->getChildHtml('content') ?>
     <div class="buttons-set">
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><?php echo $this->__('Close Window') ?></button>
     </div>
     <?php echo $this->getAbsoluteFooter() ?>
 </div>
diff --git a/app/design/frontend/base/default/template/paygate/form/cc.phtml b/app/design/frontend/base/default/template/paygate/form/cc.phtml
index ebf1e27eb98..d577534c230 100644
--- a/app/design/frontend/base/default/template/paygate/form/cc.phtml
+++ b/app/design/frontend/base/default/template/paygate/form/cc.phtml
@@ -24,7 +24,7 @@
     <?php if ($this->isPartialAuthorization()): ?>
         <?php echo $this->getChildHtml('cards') ?>
         <div class="release-amounts">
-            <button class="button" type="button" id="payment-button-cancel"><span><span>Cancel</span></span></button>
+            <button class="button" type="button" id="payment-button-cancel">Cancel</button>
             <span><?php echo $this->__('To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.') ?></span>
         </div>
         <?php echo $this->showNoticeMessage($this->__('Please enter another credit card number to complete your purchase.')) ?>
diff --git a/app/design/frontend/base/default/template/paypal/express/review.phtml b/app/design/frontend/base/default/template/paypal/express/review.phtml
index 432b309d5f9..3d5d14f3b3e 100644
--- a/app/design/frontend/base/default/template/paypal/express/review.phtml
+++ b/app/design/frontend/base/default/template/paypal/express/review.phtml
@@ -58,7 +58,7 @@
                                     </select>
                                 </fieldset>
                                 <p class="actions">
-                                    <button id="update_shipping_method_submit" type="submit" class="button"><span><span><?php echo $this->__('Update Shipping Method') ?></span></span></button>
+                                    <button id="update_shipping_method_submit" type="submit" class="button"><?php echo $this->__('Update Shipping Method') ?></button>
                                 </p>
                             <?php else: ?>
                                 <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
@@ -98,8 +98,8 @@
 <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
     <?php echo $this->getChildHtml('agreements'); ?>
     <div class="buttons-set buttons-set-order" id="review-buttons-container">
-        <button type="button" id="review_button" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
-        <button type="button" id="review_submit" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
+        <button type="button" id="review_button" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><?php echo $this->__('Place Order') ?></button>
+        <button type="button" id="review_submit" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><?php echo $this->__('Place Order') ?></button>
         <span class="please-wait" id="review-please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Submitting order information...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submitting order information...')) ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/paypal/hss/review/button.phtml b/app/design/frontend/base/default/template/paypal/hss/review/button.phtml
index 472686e587d..4350854e116 100644
--- a/app/design/frontend/base/default/template/paypal/hss/review/button.phtml
+++ b/app/design/frontend/base/default/template/paypal/hss/review/button.phtml
@@ -12,4 +12,4 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button btn-checkout" onclick="review.save();"><?php echo $this->__('Continue') ?></button>
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
index 5a58d623cd8..f86da3fe0d7 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
@@ -192,7 +192,7 @@
     <?php endif ?>
     <div class="buttons-set" id="billing-buttons-container">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><?php echo $this->__('Continue') ?></button>
         <span class="please-wait" id="billing-please-wait" style="display:none;">
             <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
         </span>
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
index 1a37d71e10a..26c5a6bdc5f 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
@@ -91,12 +91,12 @@
         <div class="buttons-set">
             <p class="required">&nbsp;</p>
             <?php if ($isAllowedGuestCheckout): ?>
-                <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
+                <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><?php echo $this->__('Continue') ?></button>
             <?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
-                <button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
+                <button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><?php echo $this->__('Register') ?></button>
             <?php else: ?>
                 <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
-                    <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
+                    <button id="onepage-guest-register-button" type="submit" class="button"><?php echo $this->__('Register') ?></button>
                 </form>
             <?php endif ?>
         </div>
@@ -105,7 +105,7 @@
         <div class="buttons-set">
             <p class="required"><?php echo $this->__('* Required Fields') ?></p>
             <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo $this->__('Forgot your password?') ?></a>
-            <button type="submit" class="button" onclick="onepageLogin(this)"><span><span><?php echo $this->__('Login') ?></span></span></button>
+            <button type="submit" class="button" onclick="onepageLogin(this)"><?php echo $this->__('Login') ?></button>
         </div>
     </div>
 </div>
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
index a853f604644..a58fb547786 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
@@ -63,13 +63,13 @@
         <div class="col2-set">
             <div class="col-1 new-users">
                 <div class="buttons-set">
-                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
+                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><?php echo $this->__('Create an Account') ?></button>
                 </div>
             </div>
             <div class="col-2 registered-users">
                 <div class="buttons-set">
                     <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
-                    <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
+                    <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><?php echo $this->__('Login') ?></button>
                 </div>
             </div>
         </div>
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
index 2659e399f49..f4abd6b3ca5 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
@@ -174,7 +174,7 @@
         <div class="buttons-set">
             <p class="required"><?php echo $this->__('* Required Fields') ?></p>
             <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-            <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
+            <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?php echo $this->__('Submit') ?></button>
         </div>
         <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
             <input name="context" type="hidden" value="checkout" />
diff --git a/app/design/frontend/base/default/template/reports/home_product_compared.phtml b/app/design/frontend/base/default/template/reports/home_product_compared.phtml
index 44860815585..85117503615 100644
--- a/app/design/frontend/base/default/template/reports/home_product_compared.phtml
+++ b/app/design/frontend/base/default/template/reports/home_product_compared.phtml
@@ -35,7 +35,7 @@
                                 onclick="customFormSubmit('<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
index a4419d6816e..2a90f333631 100644
--- a/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
+++ b/app/design/frontend/base/default/template/reports/home_product_viewed.phtml
@@ -41,7 +41,7 @@
                                         '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
index 3283cda4e3b..a958c0ab4d9 100644
--- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
@@ -39,7 +39,7 @@
                                         '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?php echo $_params ?>',
                                         'post')">
-                            <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                            <?php echo $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
index 13823be8362..ce34ef93b83 100644
--- a/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
@@ -37,7 +37,7 @@
                                             '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                             '<?php echo $_params ?>',
                                             'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         <?php else: ?>
                             <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
index 6af9704bf4b..8062406b151 100644
--- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml
@@ -44,7 +44,7 @@
                                             '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                             '<?php echo $_params ?>',
                                             'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         <?php else: ?>
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
index 755bb090595..3604b79121f 100644
--- a/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
+++ b/app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml
@@ -42,7 +42,7 @@
                                             '<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                             '<?php echo $_params ?>',
                                             'post')">
-                                <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+                                <?php echo $this->__('Add to Cart') ?>
                             </button>
                         <?php else: ?>
                                 <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/base/default/template/review/form.phtml b/app/design/frontend/base/default/template/review/form.phtml
index 6bfc69fc0e0..b1b6366e027 100644
--- a/app/design/frontend/base/default/template/review/form.phtml
+++ b/app/design/frontend/base/default/template/review/form.phtml
@@ -77,7 +77,7 @@
                 </ul>
             </fieldset>
             <div class="buttons-set">
-                <button type="submit" title="<?php echo $this->__('Submit Review') ?>" class="button"><span><span><?php echo $this->__('Submit Review') ?></span></span></button>
+                <button type="submit" title="<?php echo $this->__('Submit Review') ?>" class="button"><?php echo $this->__('Submit Review') ?></button>
             </div>
     </form>
     <script type="text/javascript">
diff --git a/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml b/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml
index aeac48fca69..93fb4e911d4 100644
--- a/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml
+++ b/app/design/frontend/base/default/template/sales/billing/agreement/view.phtml
@@ -17,7 +17,7 @@
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
     <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><?php echo $this->__('Cancel') ?></button>
     <?php endif ?>
 </div>
 <?php echo $this->getMessagesBlock()->toHtml() ?>
diff --git a/app/design/frontend/base/default/template/sales/billing/agreements.phtml b/app/design/frontend/base/default/template/sales/billing/agreements.phtml
index b955d1e5151..fb24bd88d22 100644
--- a/app/design/frontend/base/default/template/sales/billing/agreements.phtml
+++ b/app/design/frontend/base/default/template/sales/billing/agreements.phtml
@@ -74,7 +74,7 @@
                                     <option value="<?php echo $code ?>"><?php echo $title ?></option>
                                 <?php endforeach ?>
                             </select>
-                            <button type="submit" class="button"><span><span><?php echo $this->__('Create...') ?></span></span></button>
+                            <button type="submit" class="button"><?php echo $this->__('Create...') ?></button>
                         </li>
                     </ul>
                 </div>
diff --git a/app/design/frontend/base/default/template/sales/guest/form.phtml b/app/design/frontend/base/default/template/sales/guest/form.phtml
index 22101022106..4db318d781e 100644
--- a/app/design/frontend/base/default/template/sales/guest/form.phtml
+++ b/app/design/frontend/base/default/template/sales/guest/form.phtml
@@ -74,7 +74,7 @@
     </div>
     <div class="buttons-set">
         <p class="required"><?php echo Mage::helper('sales')->__('* Required Fields') ?></p>
-        <button type="submit" title="<?php echo Mage::helper('sales')->__('Continue') ?>" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('sales')->__('Continue') ?>" class="button"><?php echo Mage::helper('sales')->__('Continue') ?></button>
     </div>
 </form>
 
diff --git a/app/design/frontend/base/default/template/sales/order/details.phtml b/app/design/frontend/base/default/template/sales/order/details.phtml
index 85a6cc8024a..6c4807ba6d7 100644
--- a/app/design/frontend/base/default/template/sales/order/details.phtml
+++ b/app/design/frontend/base/default/template/sales/order/details.phtml
@@ -20,7 +20,7 @@
 <?php $_order = $this->getOrder() ?>
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('My Orders - Details') ?></h1>
-    <button class="button"><span><span><?php echo $this->__('Print All Invoices') ?></span></span></button>
+    <button class="button"><?php echo $this->__('Print All Invoices') ?></button>
 </div>
 <h3><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h3>
 <?php foreach ($this->getInvoices() as $_invoice): ?>
diff --git a/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml b/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml
index a00f0051826..7d56bd3e162 100644
--- a/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml
+++ b/app/design/frontend/base/default/template/sales/recurring/profile/view.phtml
@@ -21,16 +21,16 @@
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('Recurring Profile # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
     <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><?php echo $this->__('Cancel') ?></button>
     <?php endif ?>
     <?php if ($this->getCanSuspend()): ?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><?php echo $this->__('Suspend') ?></button>
     <?php endif ?>
     <?php if ($this->getCanActivate()): ?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><?php echo $this->__('Activate') ?></button>
     <?php endif ?>
     <?php if ($this->getCanUpdate()):?>
-        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Get Update') ?></span></span></button>
+        <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><?php echo $this->__('Get Update') ?></button>
     <?php endif ?>
 </div>
 
diff --git a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
index 2e1a3466b61..caddd7d182b 100644
--- a/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
+++ b/app/design/frontend/base/default/template/sales/reorder/sidebar.phtml
@@ -51,7 +51,7 @@
             <div id="cart-sidebar-reorder-advice-container"></div>
             <div class="actions">
                 <?php if ($_showAddButtonFlag): ?>
-                    <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                    <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart"><?php echo $this->__('Add to Cart') ?></button>
                 <?php endif ?>
                 <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo $this->__('View All'); ?></a>
             </div>
diff --git a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
index a702f69eb12..4b7709bb833 100644
--- a/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
+++ b/app/design/frontend/base/default/template/sales/widget/guest/form.phtml
@@ -60,7 +60,7 @@
                        </li>
                    </ul>
                    <div class="actions">
-                       <button type="submit" title="Continue" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
+                       <button type="submit" title="Continue" class="button"><?php echo Mage::helper('sales')->__('Continue') ?></button>
                    </div>
                </form>
             </div>
diff --git a/app/design/frontend/base/default/template/sendfriend/send.phtml b/app/design/frontend/base/default/template/sendfriend/send.phtml
index fd628dfab38..8ed4b5d2da8 100644
--- a/app/design/frontend/base/default/template/sendfriend/send.phtml
+++ b/app/design/frontend/base/default/template/sendfriend/send.phtml
@@ -106,7 +106,7 @@
         </div>
         <div class="buttons-set">
             <p class="back-link"><a href="#" onclick="history.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
-            <button type="submit" class="button<?php if (!$this->canSend()):?> disabled<?php endif ?>"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><span><span><?php echo $this->__('Send Email') ?></span></span></button>
+            <button type="submit" class="button<?php if (!$this->canSend()):?> disabled<?php endif ?>"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><?php echo $this->__('Send Email') ?></button>
             <div id="max_recipient_message" style="display:none;">
                 <?php if ($this->getMaxRecipients()): ?>
                   <p class="limit"><?php echo $this->__('Maximum %d email addresses allowed.', $this->getMaxRecipients()) ?></p>
@@ -114,7 +114,7 @@
             </div>
             <?php if (1 < $this->getMaxRecipients()): ?>
                 <p id="add_recipient_button">
-                    <button type="button" onclick="add_recipient();" class="button"><span><span><?php echo $this->__('Add Recipient') ?></span></span></button>
+                    <button type="button" onclick="add_recipient();" class="button"><?php echo $this->__('Add Recipient') ?></button>
                 </p>
             <?php endif ?>
         </div>
diff --git a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
index 696aa7a972b..da1d77fc339 100644
--- a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
+++ b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
@@ -17,7 +17,7 @@
 <?php $_results = $this->getTrackingInfo(); ?>
 <div class="page-title title-buttons">
     <h1><?php echo $this->__('Tracking Information'); ?></h1>
-    <button class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
+    <button class="button" onclick="window.close(); window.opener.focus();"><?php echo $this->__('Close Window') ?></button>
 </div>
 <?php if(count($_results) > 0): ?>
 <?php foreach($_results as $shipid => $_result): ?>
@@ -163,5 +163,5 @@
     <p><?php echo $this->__('There is no tracking available.'); ?></p>
 <?php endif ?>
 <div class="buttons-set">
-    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
+    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close(); window.opener.focus();"><?php echo $this->__('Close Window') ?></button>
 </div>
diff --git a/app/design/frontend/base/default/template/tag/customer/view.phtml b/app/design/frontend/base/default/template/tag/customer/view.phtml
index 437c3ea8ccb..c6779537a17 100644
--- a/app/design/frontend/base/default/template/tag/customer/view.phtml
+++ b/app/design/frontend/base/default/template/tag/customer/view.phtml
@@ -43,7 +43,7 @@
                 <?php if($_product->isSaleable()): ?>
                     <?php $params[Mage_Core_Model_Url::FORM_KEY] = Mage::getSingleton('core/session')->getFormKey() ?>
                     <?php $params['product'] = $_product->getId(); ?>
-                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><?php echo $this->__('Add to Cart') ?></button>
                 <?php endif ?>
                 <?php if ($this->helper('wishlist')->isAllow()) : ?>
                 <ul class="add-to-links">
diff --git a/app/design/frontend/base/default/template/wishlist/button/share.phtml b/app/design/frontend/base/default/template/wishlist/button/share.phtml
index 4bc47879bc1..921370342dc 100644
--- a/app/design/frontend/base/default/template/wishlist/button/share.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/share.phtml
@@ -15,5 +15,5 @@
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="save_and_share" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button btn-share"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
+    <button type="submit" name="save_and_share" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button btn-share"><?php echo $this->__('Share Wishlist') ?></button>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
index 84a3e1df581..2d2fadefd8b 100644
--- a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
@@ -15,5 +15,5 @@
 ?>
 
 <?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
-    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="addAllWItemsToCart()" class="button btn-add"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
+    <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="addAllWItemsToCart()" class="button btn-add"><?php echo $this->__('Add All to Cart') ?></button>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/wishlist/button/update.phtml b/app/design/frontend/base/default/template/wishlist/button/update.phtml
index fb6458be709..c205e91a9da 100644
--- a/app/design/frontend/base/default/template/wishlist/button/update.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/update.phtml
@@ -15,5 +15,5 @@
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="do" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
+    <button type="submit" name="do" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update"><?php echo $this->__('Update Wishlist') ?></button>
 <?php endif ?>
diff --git a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
index d6aeccd6aa5..bb623fa1a8c 100644
--- a/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
+++ b/app/design/frontend/base/default/template/wishlist/item/column/cart.phtml
@@ -32,7 +32,7 @@ $options = $this->getChild('customer.wishlist.item.options')
         title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>"
         onclick="addWItemToCartCustom(<?php echo $item->getId() ?>, false);"
         class="button btn-cart">
-    <span><span><?php echo $this->__('Add to Cart') ?></span></span>
+    <?php echo $this->__('Add to Cart') ?>
     </button>
 <?php else: ?>
     <?php if ($product->getIsSalable()): ?>
diff --git a/app/design/frontend/base/default/template/wishlist/shared.phtml b/app/design/frontend/base/default/template/wishlist/shared.phtml
index fccc60da101..8826a17c0fb 100644
--- a/app/design/frontend/base/default/template/wishlist/shared.phtml
+++ b/app/design/frontend/base/default/template/wishlist/shared.phtml
@@ -50,7 +50,7 @@
                     <td class="a-center">
                     <?php if ($product->isSaleable()): ?>
                         <?php if ($isVisibleProduct): ?>
-                            <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                            <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><?php echo $this->__('Add to Cart') ?></button>
                         <?php endif ?>
                     <?php endif ?>
                         <p>
@@ -73,7 +73,7 @@
         <div class="buttons-set">
             <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
             <?php if($this->isSaleable()):?>
-                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', ['_current'=>true]) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
+                <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', ['_current'=>true]) ?>')" class="button"><?php echo $this->__('Add All to Cart') ?></button>
             <?php endif ?>
         </div>
     </form>
diff --git a/app/design/frontend/base/default/template/wishlist/sharing.phtml b/app/design/frontend/base/default/template/wishlist/sharing.phtml
index 702402db44a..676ec40debd 100644
--- a/app/design/frontend/base/default/template/wishlist/sharing.phtml
+++ b/app/design/frontend/base/default/template/wishlist/sharing.phtml
@@ -48,7 +48,7 @@
     <div class="buttons-set form-buttons">
         <p class="required"><?php echo $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?php echo $this->getBackUrl(); ?>"><small>&laquo; </small><?php echo $this->__('Back')?></a></p>
-        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
+        <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button"><?php echo $this->__('Share Wishlist') ?></button>
     </div>
 </form>
 <script type="text/javascript">

From d42170ea9b859e348c4497a3c0993539052dccc9 Mon Sep 17 00:00:00 2001
From: Colin Mollenhour <colin@mollenhour.com>
Date: Tue, 9 May 2023 13:06:16 -0400
Subject: [PATCH 5/6] Moved isCurrentlySecure() method to Mage_Core_Model_App
 (#3225)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 .../Mage/Core/Controller/Request/Http.php     |  2 +-
 app/code/core/Mage/Core/Model/App.php         | 31 +++++++++++++++++++
 app/code/core/Mage/Core/Model/Store.php       | 26 ++--------------
 app/code/core/Mage/Core/etc/system.xml        |  4 +++
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index f03695690e0..fc44d53ed81 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -307,7 +307,7 @@ public function getScheme()
     {
         return $this->getServer('HTTPS') == 'on'
           || $this->getServer('HTTP_X_FORWARDED_PROTO') == 'https'
-          || (Mage::isInstalled() && Mage::app()->getStore()->isCurrentlySecure()) ?
+          || (Mage::isInstalled() && Mage::app()->isCurrentlySecure()) ?
             self::SCHEME_HTTPS :
             self::SCHEME_HTTP;
     }
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index c3237aab0c4..63fcd034ea8 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -1295,6 +1295,37 @@ public function setRequest(Mage_Core_Controller_Request_Http $request)
         return $this;
     }
 
+    /**
+     * @return bool
+     */
+    public function isCurrentlySecure()
+    {
+        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+            return true;
+        }
+
+        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+            return true;
+        }
+
+        if (isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 443)) {
+            return true;
+        }
+
+        if (Mage::isInstalled()) {
+            $offloaderHeader = strtoupper(trim((string) Mage::getConfig()->getNode(Mage_Core_Model_Store::XML_PATH_OFFLOADER_HEADER, 'default')));
+            if ($offloaderHeader) {
+                $offloaderHeader = preg_replace('/[^A-Z]+/', '_', $offloaderHeader);
+                $offloaderHeader = strpos($offloaderHeader, 'HTTP_') === 0 ? $offloaderHeader : 'HTTP_' . $offloaderHeader;
+                if (!empty($_SERVER[$offloaderHeader]) && $_SERVER[$offloaderHeader] !== 'http') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Retrieve response object
      *
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
index 042a315bc07..09df7eae0c9 100644
--- a/app/code/core/Mage/Core/Model/Store.php
+++ b/app/code/core/Mage/Core/Model/Store.php
@@ -749,34 +749,12 @@ public function isFrontUrlSecure()
     /**
      * Check if request was secure
      *
+     * @deprecated
      * @return bool
      */
     public function isCurrentlySecure()
     {
-        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
-            return true;
-        }
-
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-            return true;
-        }
-
-        if (isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 443)) {
-            return true;
-        }
-
-        if (Mage::isInstalled()) {
-            $offloaderHeader = strtoupper(trim((string) Mage::getStoreConfig(self::XML_PATH_OFFLOADER_HEADER)));
-            if ($offloaderHeader) {
-                $offloaderHeader = preg_replace('/[^A-Z]+/', '_', $offloaderHeader);
-                $offloaderHeader = strpos($offloaderHeader, 'HTTP_') === 0 ? $offloaderHeader : 'HTTP_' . $offloaderHeader;
-                if (!empty($_SERVER[$offloaderHeader]) && $_SERVER[$offloaderHeader] !== 'http') {
-                    return true;
-                }
-            }
-        }
-
-        return false;
+        return Mage::app()->isCurrentlySecure();
     }
 
     /*************************************************************************************
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index f4207991947..a3bec9e5da4 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -1499,6 +1499,10 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
+                            <comment><![CDATA[
+                                Provide the name of the request header set by the upstream proxy to indicate a secure connection.
+                                The header <code>X-Forwarded-Proto: https</code> is already checked by default regardless of this configuration option.
+                            ]]></comment>
                         </offloader_header>
                     </fields>
                 </secure>

From 460ce6547893c364aefebbeacf064d252330be76 Mon Sep 17 00:00:00 2001
From: Tobias Hille <tobihille@googlemail.com>
Date: Tue, 9 May 2023 20:35:22 +0200
Subject: [PATCH 6/6] Added cron to remove old index events for manual indexers
 (#2474)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 app/code/core/Mage/Index/Model/Indexer.php  |  4 +-
 app/code/core/Mage/Index/Model/Observer.php | 63 +++++++++++++++++++++
 app/code/core/Mage/Index/etc/config.xml     | 12 ++++
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php
index 781dd480680..49478cf2bc1 100644
--- a/app/code/core/Mage/Index/Model/Indexer.php
+++ b/app/code/core/Mage/Index/Model/Indexer.php
@@ -282,10 +282,10 @@ public function logEvent(Varien_Object $entity, $entityType, $eventType, $doSave
      * @param   Varien_Object $entity
      * @param   string $entityType
      * @param   string $eventType
-     * @throws Exception
      * @return  Mage_Index_Model_Indexer
+     * @throws Exception|Throwable
      */
-    public function processEntityAction(Varien_Object $entity, $entityType, $eventType)
+    public function processEntityAction(Varien_Object $entity, $entityType, $eventType): Mage_Index_Model_Indexer
     {
         $event = $this->logEvent($entity, $entityType, $eventType, false);
         /**
diff --git a/app/code/core/Mage/Index/Model/Observer.php b/app/code/core/Mage/Index/Model/Observer.php
index 93a15966456..84560f54fc3 100644
--- a/app/code/core/Mage/Index/Model/Observer.php
+++ b/app/code/core/Mage/Index/Model/Observer.php
@@ -19,6 +19,9 @@
  */
 class Mage_Index_Model_Observer
 {
+    public const OLD_INDEX_EVENT_THRESHOLD_SECONDS = 24 * 60 * 60;
+    public const OLD_INDEX_EVENT_DELETE_COUNT = 1000;
+
     /**
      * Indexer model
      *
@@ -35,6 +38,7 @@ public function __construct()
      * Store after commit observer. Process store related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processStoreSave(Varien_Event_Observer $observer)
     {
@@ -50,6 +54,7 @@ public function processStoreSave(Varien_Event_Observer $observer)
      * Store group after commit observer. Process store group related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processStoreGroupSave(Varien_Event_Observer $observer)
     {
@@ -65,6 +70,7 @@ public function processStoreGroupSave(Varien_Event_Observer $observer)
      * Website save after commit observer. Process website related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processWebsiteSave(Varien_Event_Observer $observer)
     {
@@ -80,6 +86,7 @@ public function processWebsiteSave(Varien_Event_Observer $observer)
      * Store after commit observer. Process store related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processStoreDelete(Varien_Event_Observer $observer)
     {
@@ -95,6 +102,7 @@ public function processStoreDelete(Varien_Event_Observer $observer)
      * Store group after commit observer. Process store group related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processStoreGroupDelete(Varien_Event_Observer $observer)
     {
@@ -110,6 +118,7 @@ public function processStoreGroupDelete(Varien_Event_Observer $observer)
      * Website save after commit observer. Process website related indexes
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processWebsiteDelete(Varien_Event_Observer $observer)
     {
@@ -125,6 +134,7 @@ public function processWebsiteDelete(Varien_Event_Observer $observer)
      * Config data after commit observer.
      *
      * @param Varien_Event_Observer $observer
+     * @throws Throwable
      */
     public function processConfigDataSave(Varien_Event_Observer $observer)
     {
@@ -135,4 +145,57 @@ public function processConfigDataSave(Varien_Event_Observer $observer)
             Mage_Index_Model_Event::TYPE_SAVE
         );
     }
+
+    /**
+     * Clean old index events for indexers in manual mode
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function cleanOutdatedEvents()
+    {
+        $manualIndexProcessCollection = Mage::getSingleton('index/indexer')
+            ->getProcessesCollection()
+            ->addFieldToFilter('mode', Mage_Index_Model_Process::MODE_MANUAL);
+
+        $now = new DateTime();
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $dateInterval = new DateInterval('PT' . self::OLD_INDEX_EVENT_THRESHOLD_SECONDS . 'S');
+        $oldEventsThreshold = $now
+            ->sub($dateInterval)
+            ->format(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT);
+
+        $coreResource = Mage::getSingleton('core/resource');
+        $writeConnection = $coreResource->getConnection('core_write');
+        $indexEventTableName = $coreResource->getTableName('index/event');
+
+        /** @var Mage_Index_Model_Process $process */
+        foreach ($manualIndexProcessCollection as $process) {
+            $unprocessedEventsCollection = $process
+                ->getUnprocessedEventsCollection()
+                ->addFieldToFilter('created_at', ['lt' => $oldEventsThreshold])
+                ->load();
+
+            $i = 0;
+            $eventList = [];
+            /** @var Mage_Index_Model_Event $unprocessedEvent */
+            foreach ($unprocessedEventsCollection as $unprocessedEvent) {
+                $i++;
+                $eventList[] = $unprocessedEvent->getId();
+                if ($i === self::OLD_INDEX_EVENT_DELETE_COUNT) {
+                    break;
+                }
+            }
+
+            if (!empty($eventList)) {
+                $where = new Zend_Db_Expr(
+                    sprintf(
+                        'event_id in (%s)',
+                        implode(',', $eventList)
+                    )
+                );
+                $writeConnection->delete($indexEventTableName, $where);
+            }
+        }
+    }
 }
diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml
index 9a46c2920b0..94e1aa18f54 100644
--- a/app/code/core/Mage/Index/etc/config.xml
+++ b/app/code/core/Mage/Index/etc/config.xml
@@ -20,6 +20,18 @@
             <version>1.6.0.0</version>
         </Mage_Index>
     </modules>
+    <crontab>
+        <jobs>
+            <index_clean_events>
+                <schedule>
+                    <cron_expr>30 */4 * * *</cron_expr>
+                </schedule>
+                <run>
+                    <model>index/observer::cleanOutdatedEvents</model>
+                </run>
+            </index_clean_events>
+        </jobs>
+    </crontab>
     <global>
         <helpers>
             <index>