From 51ced003f8f2752d83397dea3169f9c90f693053 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Thu, 12 Dec 2024 00:34:16 +0000
Subject: [PATCH] RWD: Removed double span element from HTML buttons

---
 .../rwd/default/template/catalog/msrp/popup.phtml |  2 +-
 .../template/catalog/product/compare/list.phtml   |  6 +++---
 .../catalog/product/compare/sidebar.phtml         |  2 +-
 .../default/template/catalog/product/list.phtml   |  4 ++--
 .../template/catalog/product/view/addtocart.phtml |  2 +-
 .../product/widget/new/content/new_grid.phtml     |  2 +-
 .../product/widget/new/content/new_list.phtml     |  2 +-
 .../template/catalogsearch/advanced/form.phtml    |  2 +-
 .../template/catalogsearch/form.mini.phtml        |  2 +-
 .../rwd/default/template/checkout/cart.phtml      |  8 ++++----
 .../default/template/checkout/cart/coupon.phtml   |  4 ++--
 .../template/checkout/cart/crosssell.phtml        |  2 +-
 .../checkout/cart/item/configure/updatecart.phtml |  2 +-
 .../template/checkout/cart/item/default.phtml     |  2 +-
 .../default/template/checkout/cart/shipping.phtml |  4 ++--
 .../default/template/checkout/cart/sidebar.phtml  |  2 +-
 .../checkout/multishipping/addresses.phtml        |  6 +++---
 .../template/checkout/multishipping/billing.phtml |  2 +-
 .../checkout/multishipping/overview.phtml         |  2 +-
 .../template/checkout/onepage/payment.phtml       |  2 +-
 .../template/checkout/onepage/shipping.phtml      |  2 +-
 .../rwd/default/template/contacts/form.phtml      |  2 +-
 .../default/template/customer/address/edit.phtml  |  2 +-
 .../default/template/customer/form/address.phtml  |  2 +-
 .../template/customer/form/changepassword.phtml   |  2 +-
 .../template/customer/form/confirmation.phtml     |  2 +-
 .../rwd/default/template/customer/form/edit.phtml |  2 +-
 .../template/customer/form/forgotpassword.phtml   |  2 +-
 .../template/customer/form/mini.login.phtml       |  2 +-
 .../customer/form/resetforgottenpassword.phtml    |  2 +-
 .../downloadable/checkout/cart/item/default.phtml |  2 +-
 .../template/email/catalog/product/list.phtml     |  4 ++--
 .../default/template/newsletter/subscribe.phtml   |  2 +-
 .../rwd/default/template/page/print.phtml         |  2 +-
 .../default/template/paypal/express/review.phtml  |  6 +++---
 .../widget/compared/content/compared_grid.phtml   |  2 +-
 .../widget/compared/content/compared_list.phtml   |  2 +-
 .../widget/viewed/content/viewed_grid.phtml       |  2 +-
 .../widget/viewed/content/viewed_list.phtml       |  2 +-
 .../rwd/default/template/review/form.phtml        |  2 +-
 .../template/sales/billing/agreement/view.phtml   |  2 +-
 .../template/sales/billing/agreements.phtml       |  2 +-
 .../template/sales/recurring/profile/view.phtml   |  8 ++++----
 .../template/sales/widget/guest/form.phtml        |  2 +-
 .../default/template/wishlist/button/update.phtml |  2 +-
 .../template/wishlist/item/column/cart.phtml      |  2 +-
 .../rwd/default/template/wishlist/shared.phtml    |  4 ++--
 public/skin/frontend/rwd/default/css/styles.css   | 15 ---------------
 48 files changed, 64 insertions(+), 79 deletions(-)

diff --git a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml b/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
index f6a1a0e07..81250445e 100644
--- a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
@@ -31,7 +31,7 @@
                 <div class="additional-addtocart-box">
                     <?= $this->getChildHtml() ?>
                 </div>
-                <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><span><span><?= $this->__('Add to Cart') ?></span></span></button>
+                <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><?= $this->__('Add to Cart') ?></button>
             </form>
         </div>
         <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
index 95d26146e..565d20d00 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
@@ -68,7 +68,7 @@
                                         '<?= $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
                                         '<?= $_params ?>',
                                         'post')">
-                            <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                <?= $this->__('Add to Cart') ?>
                         </button>
                     <?php else: ?>
                         <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
@@ -139,7 +139,7 @@
                                            '<?= $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
                                            '<?= $_params ?>',
                                            'post')">
-                                <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                    <?= $this->__('Add to Cart') ?>
                             </button>
                         </p>
                     <?php else: ?>
@@ -165,7 +165,7 @@
         </tbody>
     </table>
     <div class="buttons-set">
-        <button type="button" title="<?= $this->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?= $this->__('Close Window') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><?= $this->__('Close Window') ?></button>
         <span class="please-wait" id="compare-list-please-wait" style="display:none;">
             <img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= $this->quoteEscape($this->__('Please wait...')) ?>" title="<?= $this->quoteEscape($this->__('Please wait...')) ?>" class="v-middle" /> <?= $this->__('Please wait...') ?>
         </span>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml b/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml
index 607740858..3ae6948be 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml
@@ -36,7 +36,7 @@ $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
         <?php endforeach ?>
         </ol>
         <div class="actions">
-            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?= $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?= $this->__('Compare') ?></span></span></button>
+            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?= $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><?= $this->__('Compare') ?></button>
             <a href="<?= $_helper->getClearListUrl() ?>" onclick="return confirm('<?= Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you would like to remove all products from your comparison?')) ?>');"><?= $this->__('Clear All') ?></a>
         </div>
     <?php else: ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/list.phtml
index f1e870450..4f6ccc8c8 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list.phtml
@@ -81,7 +81,7 @@
                                         title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>"
                                         class="button btn-cart"
                                         onclick="customFormSubmit('<?= $_cartUrl ?>', '<?= $_params ?>', 'post')">
-                                    <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                    <?= $this->__('Add to Cart') ?>
                                 </button>
                             </p>
                         <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
@@ -164,7 +164,7 @@
                                     title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>"
                                     class="button btn-cart"
                                     onclick="customFormSubmit('<?= $_cartUrl ?>', '<?= $_params ?>', 'post')">
-                            <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                <?= $this->__('Add to Cart') ?>
                             </button>
                         <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
                             <a title="<?= $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?= $_product->getProductUrl() ?>"><?= $this->__('View Details') ?></a>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
index 1ce1c5a91..9048c2940 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
@@ -23,7 +23,7 @@
         </div>
         <?php endif ?>
         <div class="add-to-cart-buttons">
-            <button type="button" title="<?= $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?= $buttonTitle ?></span></span></button>
+            <button type="button" title="<?= $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?= $buttonTitle ?></button>
             <?= $this->getChildHtml('', true, true) ?>
         </div>
     </div>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
index 2ec2abdc3..cd82eb560 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -43,7 +43,7 @@
                                                 '<?= $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                                 '<?= $_params ?>',
                                                 'post')">
-                                    <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                    <?= $this->__('Add to Cart') ?>
                                 </button>
                             <?php else: ?>
                                 <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
index 8723a3670..2c04e2707 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
@@ -28,7 +28,7 @@
                         <?= $this->getReviewsSummaryHtml($_product, 'short') ?>
                         <?= $this->getPriceHtml($_product, true, '-widget-new-list') ?>
                         <?php if ($_product->isSaleable()): ?>
-                            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><span><span><?= $this->__('Add to Cart') ?></span></span></button>
+                            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><?= $this->__('Add to Cart') ?></button>
                         <?php else: ?>
                             <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml b/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml
index 6de76c75f..38d0069e1 100644
--- a/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml
+++ b/app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml
@@ -72,7 +72,7 @@
         </ul>
     </div>
     <div class="buttons-set">
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?= $this->__('Search') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><?= $this->__('Search') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
index 54ecba00f..ef753d2a2 100644
--- a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
+++ b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
@@ -18,7 +18,7 @@ $catalogSearchHelper =  $this->helper('catalogsearch');
     <div class="input-box">
         <label for="search"><?= $this->__('Search:') ?></label>
         <input id="search" type="search" name="<?= $catalogSearchHelper->getQueryParamName() ?>" value="<?= $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text required-entry" maxlength="<?= $catalogSearchHelper->getMaxQueryLength();?>" placeholder="<?= $this->quoteEscape($this->__('Search entire store here...')) ?>" />
-        <button type="submit" title="<?= $this->quoteEscape($this->__('Search')) ?>" class="button search-button"><span><span><?= $this->__('Search') ?></span></span></button>
+        <button type="submit" title="<?= $this->quoteEscape($this->__('Search')) ?>" class="button search-button"><?= $this->__('Search') ?></button>
     </div>
 
     <div id="search_autocomplete" class="search-autocomplete"></div>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart.phtml b/app/design/frontend/rwd/default/template/checkout/cart.phtml
index 9ed13f159..31b9848b7 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart.phtml
@@ -85,16 +85,16 @@
                     <td colspan="50" class="a-right cart-footer-actions">
 
                         <!-- Make this button the first responder rather than empty cart -->
-                        <button type="submit" style="visibility:hidden;" data-cart-item-update name="update_cart_action" value="update_qty" title="<?= $this->quoteEscape($this->__('Update Shopping Cart')) ?>" class="button2 btn-update"><span><span><?= $this->__('Update Shopping Cart') ?></span></span></button>
+                        <button type="submit" style="visibility:hidden;" data-cart-item-update name="update_cart_action" value="update_qty" title="<?= $this->quoteEscape($this->__('Update Shopping Cart')) ?>" class="button2 btn-update"><?= $this->__('Update Shopping Cart') ?></button>
 
-                        <button type="submit" name="update_cart_action" data-cart-empty value="empty_cart" title="<?= $this->quoteEscape($this->__('Empty Cart')) ?>" class="button2 btn-empty" id="empty_cart_button"><span><span><?= $this->__('Empty Cart') ?></span></span></button>
+                        <button type="submit" name="update_cart_action" data-cart-empty value="empty_cart" title="<?= $this->quoteEscape($this->__('Empty Cart')) ?>" class="button2 btn-empty" id="empty_cart_button"><?= $this->__('Empty Cart') ?></button>
 
-                        <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?= $this->quoteEscape($this->__('Update Shopping Cart')) ?>" class="button2 btn-update"><span><span><?= $this->__('Update Shopping Cart') ?></span></span></button>
+                        <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?= $this->quoteEscape($this->__('Update Shopping Cart')) ?>" class="button2 btn-update"><?= $this->__('Update Shopping Cart') ?></button>
 
                         <span class="or">-<?= $this->__('or') ?>-</span>
 
                         <?php if ($this->getContinueShoppingUrl()): ?>
-                            <button type="button" title="<?= $this->quoteEscape($this->__('Continue Shopping')) ?>" class="button2 btn-continue" onclick="setLocation('<?= Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><span><span><?= $this->__('Continue Shopping') ?></span></span></button>
+                            <button type="button" title="<?= $this->quoteEscape($this->__('Continue Shopping')) ?>" class="button2 btn-continue" onclick="setLocation('<?= Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><?= $this->__('Continue Shopping') ?></button>
                         <?php endif ?>
                     </td>
                 </tr>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml b/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml
index abb720076..0df77c1fa 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml
@@ -21,9 +21,9 @@
             <div class="field-wrapper">
                 <input class="input-text" type="text" id="coupon_code" name="coupon_code" value="<?= $this->escapeHtml($this->getCouponCode()) ?>" />
                 <div class="button-wrapper">
-                    <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Apply')) ?>" class="button2" onclick="discountForm.submit(false)" value="<?= $this->__('Apply') ?>"><span><span><?= $this->__('Apply') ?></span></span></button>
+                    <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Apply')) ?>" class="button2" onclick="discountForm.submit(false)" value="<?= $this->__('Apply') ?>"><?= $this->__('Apply') ?></button>
                     <?php if(strlen($this->getCouponCode())): ?>
-                        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button2 cancel-coupon" onclick="discountForm.submit(true)" value="<?= $this->__('Cancel') ?>"><span><span><?= $this->__('Cancel') ?></span></span>
+                        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button2 cancel-coupon" onclick="discountForm.submit(true)" value="<?= $this->__('Cancel') ?>"><?= $this->__('Cancel') ?>
                         </button>
                     <?php endif ?>
                 </div>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
index ab053b246..13e897925 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml
@@ -39,7 +39,7 @@
                                     '<?= $this->getAddToCartUrlCustom($_item, [], false) ?>',
                                     '<?= $_params ?>',
                                     'post')">
-                        <span><span><?= $this->__('Add to Cart') ?></span></span>
+                        <?= $this->__('Add to Cart') ?>
                     </button>
                     <ul class="add-to-links">
                         <?php if ($this->helper('wishlist')->isAllow()) : ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml
index f827b7171..b951e8390 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml
@@ -22,7 +22,7 @@
         </div>
         <?php endif ?>
         <div class="add-to-cart-buttons">
-            <button type="button" title="<?= Mage::helper('core')->quoteEscape($buttonTitle) ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?= $buttonTitle ?></span></span></button>
+            <button type="button" title="<?= Mage::helper('core')->quoteEscape($buttonTitle) ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?= $buttonTitle ?></button>
             <?= $this->getChildHtml('', true, true) ?>
         </div>
     </div>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
index f936e4a20..f2e9284e6 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
@@ -204,7 +204,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
                data-cart-item-id="<?= $this->jsQuoteEscape($_item->getSku()) ?>"
                title="<?= Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" maxlength="12" />
 
-        <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?= Mage::helper('core')->quoteEscape($this->__('Update')) ?>" class="button btn-update"><span><span><?= $this->__('Update') ?></span></span>
+        <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?= Mage::helper('core')->quoteEscape($this->__('Update')) ?>" class="button btn-update"><?= $this->__('Update') ?>
         </button>
 
         <ul class="cart-links">
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml
index d0a6dad94..dbacbf7aa 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml
@@ -60,7 +60,7 @@
             </ul>
             <div class="buttons-set">
                 <button type="button" title="<?= $this->quoteEscape($this->__('Estimate')) ?>" onclick="coShippingMethodForm.submit()" class="button2">
-                    <span><span><?= $this->__('Estimate') ?></span></span>
+                    <?= $this->__('Estimate') ?>
                 </button>
             </div>
         </form>
@@ -99,7 +99,7 @@
             </dl>
             <div class="buttons-set">
                 <button type="submit" title="<?= $this->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?= $this->__('Update Total') ?>">
-                    <span><span><?= $this->__('Update Total') ?></span></span>
+                    <?= $this->__('Update Total') ?>
                 </button>
             </div>
             <?= $this->getBlockHtml('formkey') ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml b/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml
index cc8711943..f49af4d04 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml
@@ -58,7 +58,7 @@
     <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
         <div class="actions">
             <?= $this->getChildHtml('extra_actions') ?>
-            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?= $this->getCheckoutUrl() ?>')"><span><span><?= $this->__('Checkout') ?></span></span></button>
+            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?= $this->getCheckoutUrl() ?>')"><?= $this->__('Checkout') ?></button>
         </div>
     <?php endif ?>
     </div>
diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml
index 8af278c5c..a31926e0b 100644
--- a/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml
@@ -23,7 +23,7 @@
     <div class="multiple-checkout">
         <div class="page-title title-buttons">
             <h1><?= $this->__('Ship to Multiple Addresses') ?></h1>
-            <button data-action="add-new-customer-address" type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Enter a New Address')) ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><span><span><?= $this->__('Enter a New Address') ?></span></span></button>
+            <button data-action="add-new-customer-address" type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Enter a New Address')) ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><?= $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" />
@@ -47,7 +47,7 @@
                     <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Update Qty &amp; Addresses')) ?>"
                             class="button" onclick="$('can_continue_flag').value=0"
                             data-multiship-item-update>
-                        <span><span><?= $this->__('Update Qty &amp; Addresses') ?></span></span>
+                        <?= $this->__('Update Qty &amp; Addresses') ?>
                     </button>
                 </td>
             </tr>
@@ -67,7 +67,7 @@
         </table>
         <div class="buttons-set">
             <p class="back-link"><a href="<?= $this->getBackUrl() ?>"><small>&laquo; </small><?= $this->__('Back to Shopping Cart') ?></a></p>
-            <button type="submit" data-action="checkout-continue-shipping" title="<?= 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><?= $this->__('Continue to Shipping Information') ?></span></span></button>
+            <button type="submit" data-action="checkout-continue-shipping" title="<?= 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 ?>><?= $this->__('Continue to Shipping Information') ?></button>
         </div>
     </div>
     <?= $this->getBlockHtml('formkey') ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
index dea7f5db3..7e3e87ebe 100644
--- a/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
@@ -78,7 +78,7 @@
         </div>
         <div class="buttons-set">
             <p class="back-link"><a href="<?= $this->getBackUrl() ?>"><small>&laquo; </small><?= $this->__('Back to Shipping Information') ?></a></p>
-            <button id="payment-continue" type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Continue to Review Your Order')) ?>" class="button"><span><span><?= $this->__('Continue to Review Your Order') ?></span></span></button>
+            <button id="payment-continue" type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Continue to Review Your Order')) ?>" class="button"><?= $this->__('Continue to Review Your Order') ?></button>
         </div>
         <?= $this->getBlockHtml('formkey') ?>
     </form>
diff --git a/app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml b/app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml
index 27417c9aa..5c0ee20ec 100644
--- a/app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml
@@ -183,7 +183,7 @@
                         <div class="inner">
                             <big><?= $this->__('Grand Total:') ?> <?= $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
                             <div id="review-buttons-container">
-                                <button type="submit" title="<?= $this->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><span><span><?= $this->__('Place Order') ?></span></span></button>
+                                <button type="submit" title="<?= $this->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><?= $this->__('Place Order') ?></button>
                             </div>
                         </div>
                     </div>
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
index 3aa0d310d..56b53e600 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
@@ -34,7 +34,7 @@
 <div class="buttons-set" id="payment-buttons-container">
     <?php // Moved to CC form ?>
     <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-    <button type="button" class="button" onclick="payment.save()"><span><span><?= $this->__('Continue') ?></span></span></button>
+    <button type="button" class="button" onclick="payment.save()"><?= $this->__('Continue') ?></button>
     <span class="please-wait" id="payment-please-wait" style="display:none;">
         <img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?= Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?= $this->__('Loading next step...') ?>
     </span>
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index a70991fbc..eef9e1a3e 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -123,7 +123,7 @@
     </ul>
     <div class="buttons-set" id="shipping-buttons-container">
         <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-        <button type="button" class="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><span><span><?= $this->__('Continue') ?></span></span></button>
+        <button type="button" class="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><?= $this->__('Continue') ?></button>
         <span id="shipping-please-wait" class="please-wait" style="display:none;">
             <img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?= Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?= $this->__('Loading next step...') ?>
         </span>
diff --git a/app/design/frontend/rwd/default/template/contacts/form.phtml b/app/design/frontend/rwd/default/template/contacts/form.phtml
index 7689e966d..d4a33470a 100644
--- a/app/design/frontend/rwd/default/template/contacts/form.phtml
+++ b/app/design/frontend/rwd/default/template/contacts/form.phtml
@@ -51,7 +51,7 @@
         </ul>
     </div>
     <div class="buttons-set">
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><span><span><?= Mage::helper('contacts')->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><?= Mage::helper('contacts')->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/address/edit.phtml b/app/design/frontend/rwd/default/template/customer/address/edit.phtml
index 7fc6d655e..8477e809e 100644
--- a/app/design/frontend/rwd/default/template/customer/address/edit.phtml
+++ b/app/design/frontend/rwd/default/template/customer/address/edit.phtml
@@ -139,7 +139,7 @@
     </div>
     <div class="buttons-set">
         <p class="back-link"><a href="<?= $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><span><span><?= $this->__('Save Address') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><?= $this->__('Save Address') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/address.phtml b/app/design/frontend/rwd/default/template/customer/form/address.phtml
index d3149e7d4..70b6a699c 100644
--- a/app/design/frontend/rwd/default/template/customer/form/address.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/address.phtml
@@ -116,7 +116,7 @@
     </div>
     <div class="buttons-set">
         <p class="back-link"><a href="<?= $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-        <button type="submit" class="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><span><span><?= $this->__('Save Address') ?></span></span></button>
+        <button type="submit" class="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><?= $this->__('Save Address') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml b/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
index 723c7e999..b8cd514f1 100644
--- a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
@@ -52,7 +52,7 @@
 </div>
 <div class="buttons-set">
     <p class="back-link"><a href="<?= $this->getUrl('customer/account') ?>"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-    <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Password')) ?>" class="button"><span><span><?= $this->__('Save Password') ?></span></span></button>
+    <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save Password')) ?>" class="button"><?= $this->__('Save Password') ?></button>
 </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml b/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
index 7f7e06d1c..a445fd209 100644
--- a/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
@@ -30,7 +30,7 @@
     <div class="buttons-set">
         <p class="required"><?= $this->__('* Required Fields') ?></p>
         <p class="back-link"><a href="<?= $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?= $this->__('Back to Login') ?></a></p>
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?= $this->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?= $this->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/edit.phtml b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
index ad87883de..eb018e0d0 100644
--- a/app/design/frontend/rwd/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
@@ -86,7 +86,7 @@
     </div>
     <div class="buttons-set">
         <p class="back-link"><a href="<?= $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?= $this->__('Save') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><?= $this->__('Save') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
index 16e332de7..738eb1720 100644
--- a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
@@ -33,7 +33,7 @@
     </div>
     <div class="buttons-set">
         <p class="back-link"><a href="<?= $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?= $this->__('Back to Login') ?></a></p>
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?= $this->__('Submit') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><?= $this->__('Submit') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml b/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
index 201a5cb34..91314356d 100644
--- a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
@@ -23,7 +23,7 @@
             <label for="mini-login"><?= $this->__('Email:') ?></label><input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="login[username]" id="mini-login" class="input-text" />
             <label for="mini-password"><?= $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><?= $this->__('Login') ?></span></span></button>
+                <button type="submit" class="button"><?= $this->__('Login') ?></button>
             </div>
         </div>
     </form>
diff --git a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
index 92c921cbf..5c0fc24e5 100644
--- a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
@@ -46,7 +46,7 @@
         </ul>
     </div>
     <div class="buttons-set">
-        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Reset a Password')) ?>" class="button"><span><span><?= $this->__('Reset a Password') ?></span></span></button>
+        <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Reset a Password')) ?>" class="button"><?= $this->__('Reset a Password') ?></button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
index 316d33545..b26f8704d 100644
--- a/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml
@@ -209,7 +209,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
            data-cart-item-id="<?= $this->jsQuoteEscape($_item->getSku()) ?>"
            size="4" title="<?= Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" maxlength="12" />
 
-    <button type="submit" data-cart-item-update name="update_cart_action" value="update_qty" title="<?= Mage::helper('core')->quoteEscape($this->__('Update')) ?>" class="button btn-update"><span><span><?= $this->__('Update') ?></span></span>
+    <button type="submit" data-cart-item-update name="update_cart_action" value="update_qty" title="<?= Mage::helper('core')->quoteEscape($this->__('Update')) ?>" class="button btn-update"><?= $this->__('Update') ?>
     </button>
 
     <ul class="cart-links">
diff --git a/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
index beb3f2498..6ac5f6149 100644
--- a/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
+++ b/app/design/frontend/rwd/default/template/email/catalog/product/list.phtml
@@ -81,7 +81,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
                                                     title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>"
                                                     class="button btn-cart"
                                                     onclick="customFormSubmit('<?= $_cartUrl ?>', '<?= $_params ?>', 'post')">
-                                                <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                                <?= $this->__('Add to Cart') ?>
                                             </button>
                                         </p>
                                     <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
@@ -162,7 +162,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
                                             title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>"
                                             class="button btn-cart"
                                             onclick="customFormSubmit('<?= $_cartUrl ?>', '<?= $_params ?>', 'post')">
-                                        <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                        <?= $this->__('Add to Cart') ?>
                                     </button>
                                 <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
                                     <a title="<?= $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?= $_product->getProductUrl() ?>"><?= $this->__('View Details') ?></a>
diff --git a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml b/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
index dbb368618..ba96be59e 100644
--- a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
+++ b/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
@@ -26,7 +26,7 @@
                <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="newsletter" title="<?= 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="<?= Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><span><span><?= $this->__('Subscribe') ?></span></span></button>
+                <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><?= $this->__('Subscribe') ?></button>
             </div>
         </div>
     </form>
diff --git a/app/design/frontend/rwd/default/template/page/print.phtml b/app/design/frontend/rwd/default/template/page/print.phtml
index 23d31efb1..f1fdef1ad 100644
--- a/app/design/frontend/rwd/default/template/page/print.phtml
+++ b/app/design/frontend/rwd/default/template/page/print.phtml
@@ -26,7 +26,7 @@
     </div>
     <?= $this->getChildHtml('content') ?>
     <div class="buttons-set">
-        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?= $this->__('Close Window') ?></span></span></button>
+        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><?= $this->__('Close Window') ?></button>
     </div>
     <?= $this->getAbsoluteFooter() ?>
 </div>
diff --git a/app/design/frontend/rwd/default/template/paypal/express/review.phtml b/app/design/frontend/rwd/default/template/paypal/express/review.phtml
index 55ad0f3a2..bab05eae6 100644
--- a/app/design/frontend/rwd/default/template/paypal/express/review.phtml
+++ b/app/design/frontend/rwd/default/template/paypal/express/review.phtml
@@ -55,7 +55,7 @@
                                     </select>
                                 </fieldset>
                                 <p class="actions">
-                                    <button id="update_shipping_method_submit" type="submit" class="button"><span><span><?= $this->__('Update Shipping Method') ?></span></span></button>
+                                    <button id="update_shipping_method_submit" type="submit" class="button"><?= $this->__('Update Shipping Method') ?></button>
                                 </p>
                             <?php else: ?>
                                 <p><strong><?= $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
@@ -95,8 +95,8 @@
 <form method="post" id="order_review_form" action="<?= $this->getPlaceOrderUrl() ?>">
     <?= $this->getChildHtml('agreements') ?>
     <div class="buttons-set buttons-set-order" id="review-buttons-container">
-        <button type="button" id="review_button" value="<?= $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?= $this->__('Place Order') ?></span></span></button>
-        <button type="button" id="review_submit" value="<?= $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?= $this->__('Place Order') ?></span></span></button>
+        <button type="button" id="review_button" value="<?= $this->__('Place Order') ?>" class="button btn-checkout"><?= $this->__('Place Order') ?></button>
+        <button type="button" id="review_submit" value="<?= $this->__('Place Order') ?>" class="button btn-checkout"><?= $this->__('Place Order') ?></button>
         <span class="please-wait" id="review-please-wait" style="display:none;">
             <img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= $this->quoteEscape($this->__('Submitting order information...')) ?>" title="<?= $this->quoteEscape($this->__('Submitting order information...')) ?>" class="v-middle" /> <?= $this->__('Submitting order information...') ?>
         </span>
diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
index bb693adc1..a3679a7bc 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
@@ -39,7 +39,7 @@
                                                 '<?= $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                                 '<?= $_params ?>',
                                                 'post')">
-                                    <span><span><?= $this->__('Add to Cart') ?></span></span>
+                                    <?= $this->__('Add to Cart') ?>
                                 </button>
                             <?php else: ?>
                                 <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
index 1bacbc4ba..b3db669b9 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
@@ -27,7 +27,7 @@
                         <?= $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
                         <?= $this->getReviewsSummaryHtml($_product, 'short') ?>
                         <?php if($_product->isSaleable()): ?>
-                            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><span><span><?= $this->__('Add to Cart') ?></span></span></button>
+                            <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><?= $this->__('Add to Cart') ?></button>
                         <?php else: ?>
                             <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
index 57b9e5f8a..e50707781 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml
@@ -40,7 +40,7 @@
                                         '<?= $this->getAddToCartUrlCustom($_product, [], false) ?>',
                                         '<?= $_params ?>',
                                         'post')">
-                            <span><span><?= $this->__('Add to Cart') ?></span></span>
+                            <?= $this->__('Add to Cart') ?>
                         </button>
                         <?php else: ?>
                                 <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
diff --git a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
index 60da51be8..ce8dc400c 100644
--- a/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
+++ b/app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml
@@ -29,7 +29,7 @@
                         <?= $this->getReviewsSummaryHtml($_product, 'short') ?>
                         <?= $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
                         <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><span><span><?= $this->__('Add to Cart') ?></span></span></button>
+                        <button type="button" title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?= $this->getAddToCartUrl($_product) ?>')"><?= $this->__('Add to Cart') ?></button>
                         <?php else: ?>
                                 <p class="availability out-of-stock"><span><?= $this->__('Out of stock') ?></span></p>
                         <?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/review/form.phtml b/app/design/frontend/rwd/default/template/review/form.phtml
index 0a4171999..fc742c4b1 100644
--- a/app/design/frontend/rwd/default/template/review/form.phtml
+++ b/app/design/frontend/rwd/default/template/review/form.phtml
@@ -105,7 +105,7 @@
                 </ul>
             </div>
             <div class="buttons-set">
-                <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit Review')) ?>" class="button"><span><span><?= $this->__('Submit Review') ?></span></span></button>
+                <button type="submit" title="<?= Mage::helper('core')->quoteEscape($this->__('Submit Review')) ?>" class="button"><?= $this->__('Submit Review') ?></button>
             </div>
     </form>
     <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml b/app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml
index 77bc08479..b36236c94 100644
--- a/app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml
+++ b/app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml
@@ -14,7 +14,7 @@
 <div class="page-title title-buttons billing-agreement-view-header-wrapper">
     <h1 class="heading"><?= $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
     <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?= $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?= $this->jsQuoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?= $this->getCancelUrl() ?>'; } return false;"><span><span><?= $this->__('Cancel') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?= $this->jsQuoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?= $this->getCancelUrl() ?>'; } return false;"><?= $this->__('Cancel') ?></button>
     <?php endif ?>
 </div>
 <?= $this->getMessagesBlock()->toHtml() ?>
diff --git a/app/design/frontend/rwd/default/template/sales/billing/agreements.phtml b/app/design/frontend/rwd/default/template/sales/billing/agreements.phtml
index 43181f414..e1f3faf78 100644
--- a/app/design/frontend/rwd/default/template/sales/billing/agreements.phtml
+++ b/app/design/frontend/rwd/default/template/sales/billing/agreements.phtml
@@ -70,7 +70,7 @@
                                     <option value="<?= $code ?>"><?= $title ?></option>
                                 <?php endforeach ?>
                             </select>
-                            <button type="submit" class="button"><span><span><?= $this->__('Create...') ?></span></span></button>
+                            <button type="submit" class="button"><?= $this->__('Create...') ?></button>
                         </li>
                     </ul>
                 </div>
diff --git a/app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml b/app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml
index b12a12d9f..8d39489b0 100644
--- a/app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml
+++ b/app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml
@@ -20,16 +20,16 @@
 </div>
 <div class="title-buttons recurring-profiles-title-buttons">
     <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?= $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getCancelUrl() ?>'; } return false;"><span><span><?= $this->__('Cancel') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getCancelUrl() ?>'; } return false;"><?= $this->__('Cancel') ?></button>
     <?php endif ?>
     <?php if ($this->getCanSuspend()): ?>
-        <button type="button" title="<?= $this->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getSuspendUrl() ?>'; } return false;"><span><span><?= $this->__('Suspend') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getSuspendUrl() ?>'; } return false;"><?= $this->__('Suspend') ?></button>
     <?php endif ?>
     <?php if ($this->getCanActivate()): ?>
-        <button type="button" title="<?= $this->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getActivateUrl() ?>'; } return false;"><span><span><?= $this->__('Activate') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getActivateUrl() ?>'; } return false;"><?= $this->__('Activate') ?></button>
     <?php endif ?>
     <?php if ($this->getCanUpdate()):?>
-        <button type="button" title="<?= $this->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getUpdateUrl() ?>'; } return false;"><span><span><?= $this->__('Get Update') ?></span></span></button>
+        <button type="button" title="<?= $this->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?= $this->getConfirmationMessage() ?>') ) { window.location.href = '<?= $this->getUpdateUrl() ?>'; } return false;"><?= $this->__('Get Update') ?></button>
     <?php endif ?>
 </div>
 
diff --git a/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml b/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml
index 9c9377cf3..a2d8c74be 100644
--- a/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml
+++ b/app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml
@@ -57,7 +57,7 @@
                        </li>
                    </ul>
                    <div class="actions">
-                       <button type="submit" title="Continue" class="button"><span><span><?= Mage::helper('sales')->__('Continue') ?></span></span></button>
+                       <button type="submit" title="Continue" class="button"><?= Mage::helper('sales')->__('Continue') ?></button>
                    </div>
                </form>
             </div>
diff --git a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml b/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
index 2ab466101..56b24a3e0 100644
--- a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
@@ -14,5 +14,5 @@
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="do" title="<?= Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update button-secondary"><span><span><?= $this->__('Update Wishlist') ?></span></span></button>
+    <button type="submit" name="do" title="<?= Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update button-secondary"><?= $this->__('Update Wishlist') ?></button>
 <?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml b/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml
index cf22e2bbe..8a3a9a52b 100644
--- a/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml
@@ -24,7 +24,7 @@ $options = $this->getChild('customer.wishlist.item.options')
             title="<?= Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>"
             onclick="addWItemToCartCustom(<?= $item->getId() ?>, false);"
             class="button btn-cart">
-        <span><span><?= $this->__('Add to Cart') ?></span></span>
+        <?= $this->__('Add to Cart') ?>
     </button>
 <?php else: ?>
     <?php if ($product->getIsSalable()): ?>
diff --git a/app/design/frontend/rwd/default/template/wishlist/shared.phtml b/app/design/frontend/rwd/default/template/wishlist/shared.phtml
index 81c4ac8ac..aac9f8dbd 100644
--- a/app/design/frontend/rwd/default/template/wishlist/shared.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/shared.phtml
@@ -48,7 +48,7 @@
                     <td class="a-center">
                     <?php if ($product->isSaleable()): ?>
                         <?php if ($isVisibleProduct): ?>
-                            <button type="button" title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?= $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?= $this->__('Add to Cart') ?></span></span></button>
+                            <button type="button" title="<?= $this->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?= $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><?= $this->__('Add to Cart') ?></button>
                         <?php endif ?>
                     <?php endif ?>
                         <p>
@@ -70,7 +70,7 @@
         <div class="buttons-set">
             <p class="back-link"><a href="<?= $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?= $this->__('Back') ?></a></p>
             <?php if($this->isSaleable()):?>
-                <button type="button" title="<?= $this->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?= $this->getUrl('*/*/allcart', ['_current'=>true]) ?>')" class="button"><span><span><?= $this->__('Add All to Cart') ?></span></span></button>
+                <button type="button" title="<?= $this->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?= $this->getUrl('*/*/allcart', ['_current'=>true]) ?>')" class="button"><?= $this->__('Add All to Cart') ?></button>
             <?php endif ?>
         </div>
     </form>
diff --git a/public/skin/frontend/rwd/default/css/styles.css b/public/skin/frontend/rwd/default/css/styles.css
index 0cee95f8a..84db408d0 100644
--- a/public/skin/frontend/rwd/default/css/styles.css
+++ b/public/skin/frontend/rwd/default/css/styles.css
@@ -599,21 +599,6 @@ a.button:hover {
   outline: none;
 }
 
-.button2 span,
-.button2 span span {
-  line-height: 30px;
-  height: 30px;
-  text-decoration: underline;
-  text-transform: uppercase;
-  display: inline-block;
-  color: #0472ad;
-}
-.button2 span:hover,
-.button2 span span:hover {
-  text-decoration: none;
-  color: #246b8f;
-}
-
 @media only screen and (max-width: 770px) {
   .col2-set .buttons-set .button,
   .col2-set .buttons-set .button2 {