From abae43f54b0d263e5596ed41fdfe39178a2e3f41 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Dec 2024 05:50:36 +0100
Subject: [PATCH 01/10] add button methods, constants etc

---
 .../core/Mage/Adminhtml/Block/Template.php    | 292 ++++++++++++++++++
 1 file changed, 292 insertions(+)

diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index 63314a08acc..b4e7ff309d3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -22,6 +22,29 @@
  */
 class Mage_Adminhtml_Block_Template extends Mage_Core_Block_Template
 {
+    public const BUTTON_ADD                 = 'add_button';
+    public const BUTTON_BACK                = 'back_button';
+    public const BUTTON_CANCEL              = 'cancel_button';
+    public const BUTTON_CLOSE               = 'close_button';
+    public const BUTTON_DELETE              = 'delete_button';
+    public const BUTTON_DUPLICATE           = 'duplicate_button';
+    public const BUTTON_RESET               = 'reset_button';
+    public const BUTTON_REFRESH             = 'refresh_button';
+    public const BUTTON_SAVE                = 'save_button';
+    public const BUTTON_SAVE_AND_CONTINUE   = 'save_and_edit_button';
+    public const BUTTON_SUBMIT              = 'submit_button';
+    public const BUTTON_UPDATE              = 'update_button';
+    public const BUTTON_UPLOAD              = 'upload_button';
+
+    public const BUTTON__CLASS_ADD          = 'add';
+    public const BUTTON__CLASS_BACK         = 'back';
+    public const BUTTON__CLASS_CANCEL       = 'cancel';
+    public const BUTTON__CLASS_DELETE       = 'delete';
+    public const BUTTON__CLASS_RESET        = 'reeet';
+    public const BUTTON__CLASS_SAVE         = 'save';
+    public const BUTTON__CLASS_TASK         = 'task';
+    public const BUTTON__CLASS_UPDATE       = 'update-button';
+
     /**
      * @return string
      */
@@ -72,4 +95,273 @@ public function maliciousCodeFilter($html)
     {
         return Mage::getSingleton('core/input_filter_maliciousCode')->filter($html);
     }
+
+    private function createWidgetButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        /** @var Mage_Adminhtml_Block_Widget_Button $block */
+        $block = $this->getLayout()->createBlock('adminhtml/widget_button', $name, $attributes);
+        return $block;
+    }
+
+    public function getButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetAddButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Add'))
+            ->setClass(self::BUTTON__CLASS_ADD);
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetAddButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetBackButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Back'))
+            ->setOnClickSetLocationJsUrl()
+            ->setClass(self::BUTTON__CLASS_BACK);
+    }
+
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetBackButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetCancelButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Cancel'))
+            ->setOnClick('window.close()')
+            ->setClass(self::BUTTON__CLASS_CANCEL);
+    }
+
+    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetCancelButtonBlock($name, $attributes);
+    }
+
+    public function getButtonBackPopupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetCancelButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetCloseButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Close Window'))
+            ->setOnClick('window.close()');
+    }
+
+    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetCloseButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetDeleteButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Delete'))
+            #->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()))
+            ->setClass(self::BUTTON__CLASS_DELETE);
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetDeleteButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetDuplicateleteButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetAddButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Duplicate'))
+            ->setOnClickSetLocationJsFullUrl($this->getDuplicateUrl());
+    }
+
+    public function getButtonDuplicateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetDuplicateleteButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetRefreshButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Refresh'))
+            ->setClass(self::BUTTON__CLASS_TASK);
+    }
+
+    public function getButtonRefreshBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetRefreshButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetResetButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Reset'))
+            ->setOnClickSetLocationJsUrl('*/*/*', ['_current' => true])
+            ->setClass(self::BUTTON__CLASS_RESET);
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetResetButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetSaveButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save'))
+            ->setClass(self::BUTTON__CLASS_SAVE);
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetSaveButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetSaveAndContinueButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save and Continue Edit'))
+            ->setOnClick(Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()))
+            ->setClass(self::BUTTON__CLASS_SAVE);
+    }
+
+    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetSaveAndContinueButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetUpdateButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setClass(self::BUTTON__CLASS_UPDATE);
+    }
+
+    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetUpdateButtonBlock($name, $attributes);
+    }
+
+    private function createWidgetUploadButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Upload Files'));
+    }
+
+    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return $this->createWidgetUploadButtonBlock($name, $attributes);
+    }
+
+    /**
+     * Retrieve Add Button HTML
+     *
+     *  @return string
+     */
+    public function getAddButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_ADD);
+    }
+
+    /**
+     * Retrieve Back Button HTML
+     *
+     *  @return string
+     */
+    public function getBackButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_BACK);
+    }
+
+    /**
+     * Retrieve Cancel Button HTML
+     *
+     *  @return string
+     */
+    public function getCancelButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_RESET);
+    }
+
+    /**
+     * Retrieve Close Button HTML
+     *
+     *  @return string
+     */
+    public function getCloseButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_CLOSE);
+    }
+
+    /**
+     * Retrieve Delete Button HTML
+     *
+     * @return string
+     */
+    public function getDeleteButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_DELETE);
+    }
+
+    /**
+     * Retrieve Delete Button HTML
+     *
+     * @return string
+     */
+    public function getDuplicateButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_DUPLICATE);
+    }
+
+    /**
+     * Retrieve Reset Button HTML
+     *
+     * @return string
+     */
+    public function getResetButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_RESET);
+    }
+
+    /**
+     * Retrieve Save Button HTML
+     *
+     * @return string
+     */
+    public function getSaveButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_SAVE);
+    }
+
+    public function getSaveAndEditButtonHtml(): string
+    {
+        return $this->getChildHtml(static::BUTTON_SAVE_AND_CONTINUE);
+    }
+
+    /**
+     * Retrieve Update Button HTML
+     *
+     * @return string
+     */
+    public function getUpdateButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_UPDATE);
+    }
+
+    /**
+     * Retrieve Upload Button HTML
+     *
+     * @return string
+     */
+    public function getUploadButtonHtml()
+    {
+        return $this->getChildHtml(static::BUTTON_UPLOAD);
+    }
 }

From b9a78367e8741d6e056eb4381c81e81b761ac608 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Dec 2024 05:54:45 +0100
Subject: [PATCH 02/10] cleanup

- removed inherited methods
- use constants for block
- remove template from constructor
---
 .../Block/Catalog/Category/Edit/Form.php      |  26 +-
 .../Adminhtml/Block/Catalog/Category/Tree.php |  23 +-
 .../Product/Attribute/New/Product/Created.php |  23 +-
 .../Catalog/Product/Attribute/Set/Main.php    |  63 ++---
 .../Attribute/Set/Main/Formattribute.php      |  24 +-
 .../Product/Attribute/Set/Main/Formgroup.php  |  36 +--
 .../Product/Attribute/Set/Toolbar/Add.php     |  29 +-
 .../Product/Attribute/Set/Toolbar/Main.php    |  13 +-
 .../Block/Catalog/Product/Created.php         |  10 +-
 .../Adminhtml/Block/Catalog/Product/Edit.php  |  56 +---
 .../Catalog/Product/Edit/Action/Attribute.php |  34 +--
 .../Product/Edit/Tab/Attributes/Create.php    |   2 +-
 .../Catalog/Product/Edit/Tab/Options.php      |  17 +-
 .../Product/Edit/Tab/Options/Option.php       |  13 +-
 .../Product/Edit/Tab/Options/Type/Select.php  |  20 +-
 .../Catalog/Product/Edit/Tab/Price/Group.php  |  15 +-
 .../Product/Edit/Tab/Price/Group/Abstract.php |  10 -
 .../Catalog/Product/Edit/Tab/Price/Tier.php   |   6 +-
 .../Catalog/Product/Edit/Tab/Settings.php     |  10 +-
 .../Catalog/Product/Edit/Tab/Super/Config.php |  12 +-
 .../Product/Edit/Tab/Super/Settings.php       |   5 +-
 .../Block/Customer/Edit/Tab/Addresses.php     |  30 +--
 .../Sales/Order/Address/Form/Renderer/Vat.php |   8 +-
 .../Adminhtml/Block/Newsletter/Problem.php    |  20 +-
 .../Adminhtml/Block/Newsletter/Queue/Edit.php |  37 +--
 .../Block/Newsletter/Template/Edit.php        |  57 +---
 .../Adminhtml/Block/Permissions/Buttons.php   |  35 +--
 .../Permissions/OrphanedResource/Grid.php     |   6 +-
 .../Promo/Quote/Edit/Tab/Coupons/Grid.php     |   2 +-
 .../core/Mage/Adminhtml/Block/Report/Grid.php |  17 +-
 .../Block/Sales/Order/Comments/View.php       |   1 +
 .../Block/Sales/Order/Create/Items/Grid.php   |   9 +-
 .../Block/Sales/Order/View/History.php        |   4 +
 .../Adminhtml/Block/System/Cache/Edit.php     |  12 +-
 .../Adminhtml/Block/System/Config/Edit.php    |  12 +-
 .../Adminhtml/Block/System/Config/Tabs.php    |  17 +-
 .../System/Convert/Gui/Edit/Tab/Wizard.php    |  11 +-
 .../System/Convert/Profile/Edit/Tab/Run.php   |   6 +-
 .../Mage/Adminhtml/Block/System/Currency.php  |  32 +--
 .../Mage/Adminhtml/Block/System/Design.php    |   8 +-
 .../Adminhtml/Block/System/Design/Edit.php    |   9 +-
 .../Adminhtml/Block/System/Email/Template.php |  21 +-
 .../Block/System/Email/Template/Edit.php      |  51 ++--
 .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php  |  12 +-
 .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php |  38 +--
 .../Mage/Adminhtml/Block/Urlrewrite/Edit.php  |   4 +-
 app/code/core/Mage/Adminhtml/Block/Widget.php |   2 +-
 .../Mage/Adminhtml/Block/Widget/Button.php    | 252 +++++++++++++++++-
 .../Block/Widget/Form/Element/Gallery.php     |  14 +-
 .../core/Mage/Adminhtml/Block/Widget/Grid.php |  14 +-
 .../Adminhtml/Block/Widget/Grid/Container.php |   2 +-
 .../OrphanedResourceController.php            |   2 +-
 .../Block/Adminhtml/Attribute/Buttons.php     |  44 +--
 .../Api2/Block/Adminhtml/Roles/Buttons.php    |  50 +---
 .../Catalog/Product/Edit/Tab/Bundle.php       |  22 +-
 .../Product/Edit/Tab/Bundle/Option.php        |  21 +-
 .../Product/Edit/Tab/Bundle/Option/Search.php |  14 +-
 .../Edit/Tab/Bundle/Option/Selection.php      |  10 +-
 app/code/core/Mage/Core/Block/Abstract.php    |   8 +-
 .../Currency/Import/Currencyconverterapi.php  |   2 +-
 .../Model/Currency/Import/Fixerio.php         |   2 +-
 .../Product/Edit/Tab/Downloadable/Links.php   |  14 +-
 .../Product/Edit/Tab/Downloadable/Samples.php |  20 +-
 .../Attribute/Edit/Options/Abstract.php       |  21 +-
 .../Config/Source/Inputtype/Validator.php     |   2 +-
 .../Block/Adminhtml/Settlement/Report.php     |   2 +-
 .../Model/Resource/Report/Collection.php      |   4 +-
 .../Mage/Sales/Model/Billing/Agreement.php    |   2 +-
 .../core/Mage/Uploader/Block/Abstract.php     |  14 +-
 .../core/Mage/Uploader/Block/Multiple.php     |  10 -
 .../Mage/Usa/Model/Shipping/Carrier/Usps.php  |   2 +-
 .../Mage/Weee/Block/Renderer/Weee/Tax.php     |  20 +-
 .../Widget/Instance/Edit/Tab/Main/Layout.php  |  17 +-
 .../widget/form/element/gallery.phtml         |   6 +-
 74 files changed, 641 insertions(+), 858 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
index f8f051df336..5a7a8c05476 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -22,6 +22,8 @@
  */
 class Mage_Adminhtml_Block_Catalog_Category_Edit_Form extends Mage_Adminhtml_Block_Catalog_Category_Abstract
 {
+    public const BLOCK_TABS = 'tabs';
+
     /**
      * Additional buttons on category page
      *
@@ -29,19 +31,18 @@ class Mage_Adminhtml_Block_Catalog_Category_Edit_Form extends Mage_Adminhtml_Blo
      */
     protected $_additionalButtons = [];
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/category/edit/form.phtml');
-    }
+    protected $_template = 'catalog/category/edit/form.phtml';
 
+    /**
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
-        $category = $this->getCategory();
+        $category   = $this->getCategory();
         $categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
 
         $this->setChild(
-            'tabs',
+            self::BLOCK_TABS,
             $this->getLayout()->createBlock('adminhtml/catalog_category_tabs', 'tabs')
         );
 
@@ -100,15 +101,10 @@ public function getStoreConfigurationUrl()
         return $this->getUrl('*/system_store', $params);
     }
 
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
-    }
-
     public function getSaveButtonHtml()
     {
         if ($this->hasStoreRootCategory()) {
-            return $this->getChildHtml('save_button');
+            return $this->getChildHtml(self::BUTTON_SAVE);
         }
         return '';
     }
@@ -116,7 +112,7 @@ public function getSaveButtonHtml()
     public function getResetButtonHtml()
     {
         if ($this->hasStoreRootCategory()) {
-            return $this->getChildHtml('reset_button');
+            return $this->getChildHtml(self::BUTTON_RESET);
         }
         return '';
     }
@@ -173,7 +169,7 @@ public function removeAdditionalButton($alias)
 
     public function getTabsHtml()
     {
-        return $this->getChildHtml('tabs');
+        return $this->getChildHtml(self::BLOCK_TABS);
     }
 
     public function getHeader()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
index 5c3b4bda864..6f70c43dd35 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -22,12 +22,18 @@
  */
 class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract
 {
+    public const BLOCK_STORE_SWITCHER = 'store_switcher';
+
+    public const BUTTON_ADD_ROOT    = 'add_root_button';
+    public const BUTTON_ADD_SUB     = 'add_sub_button';
+
     protected $_withProductCount;
 
+    protected $_template = 'catalog/category/tree.phtml';
+
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('catalog/category/tree.phtml');
         $this->setUseAjax(true);
         $this->_withProductCount = true;
     }
@@ -41,7 +47,7 @@ protected function _prepareLayout()
         ]);
 
         $this->setChild(
-            'add_sub_button',
+            self::BUTTON_ADD_SUB,
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData([
                     'label'     => Mage::helper('catalog')->__('Add Subcategory'),
@@ -54,7 +60,7 @@ protected function _prepareLayout()
 
         if ($this->canAddRootCategory()) {
             $this->setChild(
-                'add_root_button',
+                self::BUTTON_ADD_ROOT,
                 $this->getLayout()->createBlock('adminhtml/widget_button')
                     ->setData([
                         'label'     => Mage::helper('catalog')->__('Add Root Category'),
@@ -66,7 +72,7 @@ protected function _prepareLayout()
         }
 
         $this->setChild(
-            'store_switcher',
+            self::BLOCK_STORE_SWITCHER,
             $this->getLayout()->createBlock('adminhtml/store_switcher')
                 ->setSwitchUrl($this->getUrl('*/*/*', ['_current' => true, '_query' => false, 'store' => null]))
                 ->setTemplate('store/switcher/enhanced.phtml')
@@ -84,9 +90,8 @@ public function getCategoryCollection()
         $storeId = $this->getRequest()->getParam('store', $this->_getDefaultStoreId());
         $collection = $this->getData('category_collection');
         if (is_null($collection)) {
+            /** @var Mage_Catalog_Model_Resource_Category_Collection $collection */
             $collection = Mage::getModel('catalog/category')->getCollection();
-
-            /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection $collection */
             $collection->addAttributeToSelect('name')
                 ->addAttributeToSelect('is_active')
                 ->setProductStoreId($storeId)
@@ -100,12 +105,12 @@ public function getCategoryCollection()
 
     public function getAddRootButtonHtml()
     {
-        return $this->getChildHtml('add_root_button');
+        return $this->getChildHtml(self::BUTTON_ADD_ROOT);
     }
 
     public function getAddSubButtonHtml()
     {
-        return $this->getChildHtml('add_sub_button');
+        return $this->getChildHtml(self::BUTTON_ADD_SUB);
     }
 
     public function getExpandButtonHtml()
@@ -120,7 +125,7 @@ public function getCollapseButtonHtml()
 
     public function getStoreSwitcherHtml()
     {
-        return $this->getChildHtml('store_switcher');
+        return $this->getChildHtml(self::BLOCK_STORE_SWITCHER);
     }
 
     public function getLoadTreeUrl($expanded = null)
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
index 4bf2877d5cc..9896c106e98 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
@@ -22,14 +22,9 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created extends Mage_Adminhtml_Block_Widget
 {
-    /**
-     * Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/product/attribute/new/created.phtml');
-    }
+    public const BLOCK_ATTRIBUTES = 'attributes';
+
+    protected $_template = 'catalog/product/attribute/new/created.phtml';
 
     /**
      * @return $this
@@ -38,7 +33,7 @@ public function __construct()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'attributes',
+            self::BLOCK_ATTRIBUTES,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_new_product_attributes')
                 ->setGroupAttributes($this->_getGroupAttributes())
         );
@@ -72,14 +67,6 @@ protected function _getGroupAttributes()
         return $attributes;
     }
 
-    /**
-     * @return string
-     */
-    public function getCloseButtonHtml()
-    {
-        return $this->getChildHtml('close_button');
-    }
-
     /**
      * @return string
      * @throws Exception
@@ -87,7 +74,7 @@ public function getCloseButtonHtml()
     public function getAttributesBlockJson()
     {
         $result = [
-            $this->getRequest()->getParam('tab') => $this->getChildHtml('attributes')
+            $this->getRequest()->getParam('tab') => $this->getChildHtml(self::BLOCK_ATTRIBUTES)
         ];
 
         return Mage::helper('core')->jsonEncode($result);
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
index 47e2f587dc0..de7852901bb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
@@ -22,13 +22,14 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main extends Mage_Adminhtml_Block_Template
 {
-    /**
-     * Initialize template
-     */
-    protected function _construct()
-    {
-        $this->setTemplate('catalog/product/attribute/set/main.phtml');
-    }
+    public const BLOCK_EDIT_SET_FORM    = 'edit_set_form';
+    public const BLOCK_GROUP_TREE       = 'group_tree';
+
+    public const BUTTON_ADD_GROUP       = 'add_group_button';
+    public const BUTTON_DELETE_GROUP    = 'delete_group_button';
+    public const BUTTON_RENAME          = 'rename_button';
+
+    protected $_template = 'catalog/product/attribute/set/main.phtml';
 
     /**
      * Prepare Global Layout
@@ -40,12 +41,12 @@ protected function _prepareLayout()
         $setId = $this->_getSetId();
 
         $this->setChild(
-            'group_tree',
+            self::BLOCK_GROUP_TREE,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_tree_group')
         );
 
         $this->setChild(
-            'edit_set_form',
+            self::BLOCK_EDIT_SET_FORM,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_formset')
         );
 
@@ -123,7 +124,7 @@ protected function _prepareLayout()
      */
     public function getGroupTreeHtml()
     {
-        return $this->getChildHtml('group_tree');
+        return $this->getChildHtml(self::BLOCK_GROUP_TREE);
     }
 
     /**
@@ -133,7 +134,7 @@ public function getGroupTreeHtml()
      */
     public function getSetFormHtml()
     {
-        return $this->getChildHtml('edit_set_form');
+        return $this->getChildHtml(self::BLOCK_EDIT_SET_FORM);
     }
 
     /**
@@ -283,39 +284,7 @@ public function getAttributeTreeJson()
     }
 
     /**
-     * Retrieve Back Button HTML
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
-    }
-
-    /**
-     * Retrieve Reset Button HTML
-     *
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
-    /**
-     * Retrieve Save Button HTML
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
-    /**
-     * Retrieve Delete Button HTML
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getDeleteButtonHtml()
     {
@@ -332,7 +301,7 @@ public function getDeleteButtonHtml()
      */
     public function getDeleteGroupButton()
     {
-        return $this->getChildHtml('delete_group_button');
+        return $this->getChildHtml(self::BUTTON_DELETE_GROUP);
     }
 
     /**
@@ -342,7 +311,7 @@ public function getDeleteGroupButton()
      */
     public function getAddGroupButton()
     {
-        return $this->getChildHtml('add_group_button');
+        return $this->getChildHtml(self::BUTTON_ADD_GROUP);
     }
 
     /**
@@ -352,7 +321,7 @@ public function getAddGroupButton()
      */
     public function getRenameButton()
     {
-        return $this->getChildHtml('rename_button');
+        return $this->getChildHtml(self::BUTTON_RENAME);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
index daec4de0541..5c5e79ee53d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
@@ -30,24 +30,24 @@ protected function _prepareForm()
             'new_attribute',
             'text',
             [
-                                'label' => Mage::helper('catalog')->__('Name'),
-                                'name' => 'new_attribute',
-                                'required' => true,
-                            ]
+                'label' => Mage::helper('catalog')->__('Name'),
+                'name' => 'new_attribute',
+                'required' => true,
+            ]
         );
 
         $fieldset->addField(
             'submit',
             'note',
             [
-                                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
-                                            ->setData([
-                                                'label'     => Mage::helper('catalog')->__('Add Attribute'),
-                                                'onclick'   => 'this.form.submit();',
-                                                                                                'class' => 'add'
-                                            ])
-                                            ->toHtml(),
-                            ]
+                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
+                    ->setData([
+                        'label'     => Mage::helper('catalog')->__('Add Attribute'),
+                        'onclick'   => 'this.form.submit();',
+                        'class'     => 'add'
+                    ])
+                    ->toHtml(),
+            ]
         );
 
         $form->setUseContainer(true);
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
index 21f5291e207..013be190690 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
@@ -30,33 +30,33 @@ protected function _prepareForm()
             'attribute_group_name',
             'text',
             [
-                                'label' => Mage::helper('catalog')->__('Name'),
-                                'name' => 'attribute_group_name',
-                                'required' => true,
-                            ]
+                'label' => Mage::helper('catalog')->__('Name'),
+                'name' => 'attribute_group_name',
+                'required' => true,
+            ]
         );
 
         $fieldset->addField(
             'submit',
             'note',
             [
-                                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
-                                            ->setData([
-                                                'label'     => Mage::helper('catalog')->__('Add Group'),
-                                                'onclick'   => 'this.form.submit();',
-                                                                                                'class' => 'add'
-                                            ])
-                                            ->toHtml(),
-                            ]
+                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
+                ->setData([
+                    'label'     => Mage::helper('catalog')->__('Add Group'),
+                    'onclick'   => 'this.form.submit();',
+                    'class'     => 'add'
+                ])
+                ->toHtml(),
+            ]
         );
 
         $fieldset->addField(
             'attribute_set_id',
             'hidden',
             [
-                                'name' => 'attribute_set_id',
-                                'value' => $this->_getSetId(),
-                            ]
+                'name' => 'attribute_set_id',
+                'value' => $this->_getSetId(),
+            ]
         );
 
         $form->setUseContainer(true);
@@ -69,8 +69,8 @@ protected function _prepareForm()
     protected function _getSetId()
     {
         return ((int) $this->getRequest()->getParam('id') > 0)
-                    ? (int) $this->getRequest()->getParam('id')
-                    : Mage::getSingleton('eav/config')->getEntityType(Mage::registry('entityType'))
-                        ->getDefaultAttributeSetId();
+            ? (int) $this->getRequest()->getParam('id')
+            : Mage::getSingleton('eav/config')->getEntityType(Mage::registry('entityType'))
+                ->getDefaultAttributeSetId();
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
index 2ea600035c4..1a48f380620 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
@@ -20,10 +20,9 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add extends Mage_Adminhtml_Block_Template
 {
-    protected function _construct()
-    {
-        $this->setTemplate('catalog/product/attribute/set/toolbar/add.phtml');
-    }
+    public const BLOCK_FORM = 'setForm';
+
+    protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
 
     /**
      * @inheritDoc
@@ -50,7 +49,7 @@ protected function _prepareLayout()
         );
 
         $this->setChild(
-            'setForm',
+            self::BLOCK_FORM,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_formset')
         );
         return parent::_prepareLayout();
@@ -64,32 +63,16 @@ protected function _getHeader()
         return Mage::helper('catalog')->__('Add New Attribute Set');
     }
 
-    /**
-     * @return string
-     */
-    protected function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
-    /**
-     * @return string
-     */
-    protected function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
-    }
-
     /**
      * @return string
      */
     protected function getFormHtml()
     {
-        return $this->getChildHtml('setForm');
+        return $this->getChildHtml(self::BLOCK_FORM);
     }
 
     protected function getFormId()
     {
-        return $this->getChild('setForm')->getForm()->getId();
+        return $this->getChild(self::BLOCK_FORM)->getForm()->getId();
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
index a0f41b3393f..e400c5909d9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
@@ -22,13 +22,12 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/product/attribute/set/toolbar/main.phtml');
-    }
+    public const BUTTON_ADD = 'addButton';
+
+    protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -47,10 +46,12 @@ protected function _prepareLayout()
 
     /**
      * @return string
+     * @deprecated
+     * @see getAddButtonHtml()
      */
     protected function getNewButtonHtml()
     {
-        return $this->getChildHtml('addButton');
+        return $this->getChildHtml(self::BUTTON_ADD);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
index 90324463fe8..78bc6ebab00 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
@@ -25,12 +25,12 @@ class Mage_Adminhtml_Block_Catalog_Product_Created extends Mage_Adminhtml_Block_
     protected $_configurableProduct;
     protected $_product;
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/product/created.phtml');
-    }
+    protected $_template = 'catalog/product/created.phtml';
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
index 4c07a879fa4..bee32088e5c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -23,12 +23,8 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Widget
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/product/edit.phtml');
-        $this->setId('product_edit');
-    }
+    protected $_idFieldName = 'product_edit';
+    protected $_template    = 'catalog/product/edit.phtml';
 
     /**
      * Retrieve currently edited product object
@@ -128,54 +124,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getCancelButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getSaveAndEditButtonHtml()
-    {
-        return $this->getChildHtml('save_and_edit_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getDuplicateButtonHtml()
-    {
-        return $this->getChildHtml('duplicate_button');
-    }
-
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
index f73c584cb83..761488cf170 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
@@ -22,6 +22,10 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute extends Mage_Adminhtml_Block_Widget
 {
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -80,36 +84,6 @@ protected function _getHelper()
         return $this->helper('adminhtml/catalog_product_edit_action_attribute');
     }
 
-    /**
-     * Retrieve back button html code
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
-    }
-
-    /**
-     * Retrieve cancel button html code
-     *
-     * @return string
-     */
-    public function getCancelButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
-    /**
-     * Retrieve save button html code
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
     /**
      * Get save url
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
index d7d1944e299..f2a9b6ebd0c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
@@ -50,7 +50,7 @@ protected function _beforeToHtml()
     {
         $this->setId('create_attribute_' . $this->getConfig()->getGroupId())
             ->setOnClick($this->getJsObjectName() . '.create();')
-            ->setType('button')
+            ->setType(self::TYPE_BUTTON)
             ->setClass('add')
             ->setLabel(Mage::helper('adminhtml')->__('Create New Attribute'));
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
index be58d8e5e5f..d05820504c5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
@@ -22,16 +22,14 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options extends Mage_Adminhtml_Block_Widget
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('catalog/product/edit/options.phtml');
-    }
+    public const BLOCK_OPTION_BOX = 'options_box';
+
+    protected $_template = 'catalog/product/edit/options.phtml';
 
     protected function _prepareLayout()
     {
         $this->setChild(
-            'add_button',
+            self::BLOCK_OPTION_BOX,
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData([
                     'label' => Mage::helper('catalog')->__('Add New Option'),
@@ -48,13 +46,8 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
-
     public function getOptionsBoxHtml()
     {
-        return $this->getChildHtml('options_box');
+        return $this->getChildHtml(self::BLOCK_OPTION_BOX);
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
index 0c3837e6200..2b1b9b31972 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
@@ -30,13 +30,14 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_
 
     protected $_itemCount = 1;
 
+    protected $_template = 'catalog/product/edit/options/option.phtml';
+
     /**
      * Class constructor
      */
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('catalog/product/edit/options/option.phtml');
         $this->setCanReadPrice(true);
         $this->setCanEditPrice(true);
     }
@@ -118,7 +119,6 @@ protected function _prepareLayout()
         );
 
         $path = 'global/catalog/product/options/custom/groups';
-
         foreach (Mage::getConfig()->getNode($path)->children() as $group) {
             $this->setChild(
                 $group->getName() . '_option_type',
@@ -134,13 +134,8 @@ protected function _prepareLayout()
     public function getAddButtonId()
     {
         return $this->getLayout()
-                ->getBlock('admin.product.options')
-                ->getChild('add_button')->getId();
-    }
-
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
+            ->getBlock('admin.product.options')
+            ->getChild(self::BUTTON_ADD)->getId();
     }
 
     public function getTypeSelectHtml()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
index 42edef63968..0ed5e1129e8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
@@ -22,17 +22,25 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract
 {
+    public const BUTTON_ADD     = 'add_select_row_button';
+    public const BUTTON_DELETE  = 'delete_select_row_button';
+
+    protected $_template = 'catalog/product/edit/options/type/select.phtml';
+
     /**
      * Class constructor
      */
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('catalog/product/edit/options/type/select.phtml');
         $this->setCanEditPrice(true);
         $this->setCanReadPrice(true);
     }
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -58,16 +66,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_select_row_button');
-    }
-
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_select_row_button');
-    }
-
     public function getPriceTypeSelectHtml()
     {
         $this->getChild('option_price_type')
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
index 0bf686a3f88..4c3ff9f863a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
@@ -22,13 +22,7 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group_Abstract
 {
-    /**
-     * Initialize block
-     */
-    public function __construct()
-    {
-        $this->setTemplate('catalog/product/edit/price/group.phtml');
-    }
+    protected $_template = 'catalog/product/edit/price/group.phtml';
 
     /**
      * Sort values
@@ -61,11 +55,8 @@ protected function _sortGroupPrices($a, $b)
     }
 
     /**
-     * Prepare global layout
-     *
-     * Add "Add Group Price" button to layout
-     *
-     * @return $this
+     * @codeCoverageIgnore
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php
index dd4503a64b2..68e48ababfa 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php
@@ -243,16 +243,6 @@ public function getDefaultWebsite()
         return 0;
     }
 
-    /**
-     * Retrieve 'add group price item' button HTML
-     *
-     * @return string
-     */
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
-
     /**
      * Retrieve customized price column header
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
index a42efa66c4a..0e51b69a414 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
@@ -22,10 +22,7 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group_Abstract
 {
-    public function __construct()
-    {
-        $this->setTemplate('catalog/product/edit/price/tier.phtml');
-    }
+    protected $_template = 'catalog/product/edit/price/tier.phtml';
 
     /**
      * Retrieve list of initial customer groups
@@ -75,6 +72,7 @@ protected function _sortTierPrices($a, $b)
      * Prepare global layout
      * Add "Add tier" button to layout
      *
+     * @codeCoverageIgnore
      * @return $this
      */
     protected function _prepareLayout()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
index 4d674da0426..19efa6a465d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
@@ -22,6 +22,12 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings extends Mage_Adminhtml_Block_Widget_Form
 {
+    public const BUTTON_CONTINUE = 'continue_button';
+
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -63,8 +69,8 @@ protected function _prepareForm()
             'values' => Mage::getModel('catalog/product_type')->getOptionArray()
         ]);
 
-        $fieldset->addField('continue_button', 'note', [
-            'text' => $this->getChildHtml('continue_button'),
+        $fieldset->addField(self::BUTTON_CONTINUE, 'note', [
+            'text' => $this->getChildHtml(self::BUTTON_CONTINUE),
         ]);
 
         $this->setForm($form);
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
index 10b8d59ced2..3b23b2f3ecd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
@@ -22,16 +22,16 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
-    /**
-     * Initialize block
-     *
-     */
+    public const BUTTON_CREATE_EMPTY        = 'create_empty';
+    public const BUTTON_CREATE_CONFIGURABLE = 'create_from_configurable';
+
+    protected $_idFieldName = 'config_super_product';
+    protected $_template    = 'catalog/product/edit/super/config.phtml';
+
     public function __construct()
     {
         parent::__construct();
         $this->setProductId($this->getRequest()->getParam('id'));
-        $this->setTemplate('catalog/product/edit/super/config.phtml');
-        $this->setId('config_super_product');
         $this->setCanEditPrice(true);
         $this->setCanReadPrice(true);
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
index e3bee5f27fc..1d1aa214acd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
@@ -22,8 +22,11 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings extends Mage_Adminhtml_Block_Widget_Form
 {
+    public const BUTTON_CONTINUE = 'continue_button';
+
     /**
-     * Prepare block children and data
+     * @codeCoverageIgnore
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index 087797e31a7..6996c4b6d11 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -22,14 +22,9 @@
  */
 class Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses extends Mage_Adminhtml_Block_Widget_Form
 {
-    /**
-     * Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('customer/tab/addresses.phtml');
-    }
+    public const BUTTON_ADD = 'add_address_button';
+
+    protected $_template = 'customer/tab/addresses.phtml';
 
     /**
      * @return string
@@ -40,6 +35,7 @@ public function getRegionsUrl()
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -95,14 +91,6 @@ public function isReadonly()
         return $customer->isReadonly();
     }
 
-    /**
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
-    }
-
     /**
      * Initialize form object
      *
@@ -211,20 +199,12 @@ public function initForm()
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getCancelButtonHtml()
-    {
-        return $this->getChildHtml('cancel_button');
-    }
-
     /**
      * @return string
      */
     public function getAddNewButtonHtml()
     {
-        return $this->getChildHtml('add_address_button');
+        return $this->getChildHtml(self::BUTTON_ADD);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
index abfb6ff0265..d19f20f5448 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
@@ -29,13 +29,7 @@ class Mage_Adminhtml_Block_Customer_Sales_Order_Address_Form_Renderer_Vat extend
      */
     protected $_validateButton = null;
 
-    /**
-     * Set custom template for 'VAT number'
-     */
-    protected function _construct()
-    {
-        $this->setTemplate('customer/sales/order/create/address/form/renderer/vat.phtml');
-    }
+    protected $_template = 'customer/sales/order/create/address/form/renderer/vat.phtml';
 
     /**
      * Retrieve validate button block
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
index 5ceda3ed212..8229bf331d8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
@@ -22,11 +22,18 @@
  */
 class Mage_Adminhtml_Block_Newsletter_Problem extends Mage_Adminhtml_Block_Template
 {
+    public const BLOCK_GRID = 'grid';
+
+    public const BUTTON_DELETE      = 'deleteButton';
+    public const BUTTON_UNSUBSCRIBE = 'unsubscribeButton';
+
+    protected $_template = 'newsletter/problem/list.phtml';
+
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('newsletter/problem/list.phtml');
-        $collection = Mage::getResourceSingleton('newsletter/problem_collection')
+
+        Mage::getResourceSingleton('newsletter/problem_collection')
             ->addSubscriberInfo()
             ->addQueueInfo();
     }
@@ -34,7 +41,7 @@ public function __construct()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'grid',
+            self::BLOCK_GRID,
             $this->getLayout()->createBlock('adminhtml/newsletter_problem_grid', 'newsletter.problem.grid')
         );
 
@@ -64,12 +71,7 @@ protected function _prepareLayout()
 
     public function getUnsubscribeButtonHtml()
     {
-        return $this->getChildHtml('unsubscribeButton');
-    }
-
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('deleteButton');
+        return $this->getChildHtml(self::BUTTON_UNSUBSCRIBE);
     }
 
     public function getShowButtons()
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
index f51d1cb9c91..c90ce04032c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -22,6 +22,9 @@
  */
 class Mage_Adminhtml_Block_Newsletter_Queue_Edit extends Mage_Adminhtml_Block_Template
 {
+    public const BUTTON_PREVIEW           = 'preview_button';
+    public const BUTTON_SAVE_AND_CONTINUE = 'save_and_resume';
+
     /**
      * Check for template Id in request
      */
@@ -156,37 +159,7 @@ public function getPreviewUrl()
      */
     public function getPreviewButtonHtml()
     {
-        return $this->getChildHtml('preview_button');
-    }
-
-    /**
-     * Retrieve Save Button HTML
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
-    /**
-     * Retrieve Reset Button HTML
-     *
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
-    /**
-     * Retrieve Back Button HTML
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
+        return $this->getChildHtml(self::BUTTON_PREVIEW);
     }
 
     /**
@@ -196,7 +169,7 @@ public function getBackButtonHtml()
      */
     public function getResumeButtonHtml()
     {
-        return $this->getChildHtml('save_and_resume');
+        return $this->getChildHtml(self::BUTTON_SAVE_AND_CONTINUE);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
index 7914d89018c..7fcd0285cb3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
@@ -22,6 +22,11 @@
  */
 class Mage_Adminhtml_Block_Newsletter_Template_Edit extends Mage_Adminhtml_Block_Widget
 {
+    public const BUTTON_PREVIEW  = 'preview_button';
+    public const BUTTON_SAVE_AS  = 'save_as_button';
+    public const BUTTON_TO_HTML  = 'to_html_button';
+    public const BUTTON_TO_PLAIN = 'to_plain_button';
+
     /**
      * Edit Block model
      *
@@ -45,7 +50,9 @@ public function getModel()
     protected function _prepareLayout()
     {
         // Load Wysiwyg on demand and Prepare layout
-        if (Mage::getSingleton('cms/wysiwyg_config')->isEnabled() && ($block = $this->getLayout()->getBlock('head'))) {
+        if (Mage::getSingleton('cms/wysiwyg_config')->isEnabled()
+            && ($block = $this->getLayout()->getBlock('head'))
+        ) {
             $block->setCanLoadTinyMce(true);
         }
 
@@ -134,26 +141,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * Retrieve Back Button HTML
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('back_button');
-    }
-
-    /**
-     * Retrieve Reset Button HTML
-     *
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
     /**
      * Retrieve Convert To Plain Button HTML
      *
@@ -161,7 +148,7 @@ public function getResetButtonHtml()
      */
     public function getToPlainButtonHtml()
     {
-        return $this->getChildHtml('to_plain_button');
+        return $this->getChildHtml(self::BUTTON_TO_PLAIN);
     }
 
     /**
@@ -171,17 +158,7 @@ public function getToPlainButtonHtml()
      */
     public function getToHtmlButtonHtml()
     {
-        return $this->getChildHtml('to_html_button');
-    }
-
-    /**
-     * Retrieve Save Button HTML
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
+        return $this->getChildHtml(self::BUTTON_TO_HTML);
     }
 
     /**
@@ -191,17 +168,7 @@ public function getSaveButtonHtml()
      */
     public function getPreviewButtonHtml()
     {
-        return $this->getChildHtml('preview_button');
-    }
-
-    /**
-     * Retrieve Delete Button HTML
-     *
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
+        return $this->getChildHtml(self::BUTTON_PREVIEW);
     }
 
     /**
@@ -211,7 +178,7 @@ public function getDeleteButtonHtml()
      */
     public function getSaveAsButtonHtml()
     {
-        return $this->getChildHtml('save_as_button');
+        return $this->getChildHtml(self::BUTTON_SAVE_AS);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
index 04c3bd9668e..e3bf9746373 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
@@ -20,12 +20,17 @@
  */
 class Mage_Adminhtml_Block_Permissions_Buttons extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('permissions/userinfo.phtml');
-    }
+    public const BUTTON_BACK    = 'backButton';
+    public const BUTTON_DELETE  = 'deleteButton';
+    public const BUTTON_RESET   = 'resetButton';
+    public const BUTTON_SAVE    = 'saveButton';
+
+    protected $_template = 'permissions/userinfo.phtml';
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -71,25 +76,13 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('backButton');
-    }
-
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('resetButton');
-    }
-
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('saveButton');
-    }
-
+    /**
+     * @inheritDoc
+     */
     public function getDeleteButtonHtml()
     {
         if ((int) $this->getRequest()->getParam('rid') == 0) {
-            return;
+            return '';
         }
         return $this->getChildHtml('deleteButton');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php
index cb4bd5be707..2ce5af05eb6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/OrphanedResource/Grid.php
@@ -32,7 +32,7 @@ public function __construct()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _prepareCollection()
     {
@@ -55,7 +55,7 @@ protected function _prepareCollection()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _prepareColumns()
     {
@@ -68,7 +68,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _prepareMassaction()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
index 0eca2099fec..5cd1282f72c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -132,7 +132,7 @@ public function getGridUrl()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index 2ca12323b90..f5b84f39b90 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -24,6 +24,8 @@
  */
 class Mage_Adminhtml_Block_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid
 {
+    public const BLOCK_STORE_SWITCHER = 'store_switcher';
+
     protected $_storeSwitcherVisibility = true;
 
     protected $_dateFilterVisibility = true;
@@ -35,8 +37,8 @@ class Mage_Adminhtml_Block_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid
     protected $_filters = [];
 
     protected $_defaultFilters = [
-            'report_from' => '',
-            'report_to' => '',
+            'report_from'   => '',
+            'report_to'     => '',
             'report_period' => 'day'
     ];
 
@@ -59,6 +61,8 @@ class Mage_Adminhtml_Block_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid
     /** @todo OM: check */
     protected $_filterValues;
 
+    protected $_template = 'report/grid.phtml';
+
     /**
      * Mage_Adminhtml_Block_Report_Grid constructor.
      */
@@ -67,7 +71,6 @@ public function __construct()
         parent::__construct();
         $this->setFilterVisibility(false);
         $this->setPagerVisibility(false);
-        $this->setTemplate('report/grid.phtml');
         $this->setUseAjax(false);
         $this->setCountTotals(true);
     }
@@ -78,7 +81,7 @@ public function __construct()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'store_switcher',
+            self::BLOCK_STORE_SWITCHER,
             $this->getLayout()->createBlock('adminhtml/store_switcher')
                 ->setUseConfirm(false)
                 ->setSwitchUrl($this->getUrl('*/*/*', ['store' => null]))
@@ -115,7 +118,7 @@ protected function _prepareColumns()
      */
     protected function _prepareCollection()
     {
-        $filter = $this->getParam($this->getVarNameFilter(), null);
+        $filter = $this->getParam($this->getVarNameFilter());
 
         if (is_null($filter)) {
             $filter = $this->_defaultFilter;
@@ -241,7 +244,7 @@ public function getStoreSwitcherVisibility()
      */
     public function getStoreSwitcherHtml()
     {
-        return $this->getChildHtml('store_switcher');
+        return $this->getChildHtml(self::BLOCK_STORE_SWITCHER);
     }
 
     /**
@@ -319,7 +322,7 @@ public function getDateFormat()
      */
     public function getRefreshButtonHtml()
     {
-        return $this->getChildHtml('refresh_button');
+        return $this->getChildHtml(self::BUTTON_REFRESH);
     }
 
     public function setFilter($name, $value)
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
index d0f486032d8..8896e9333cf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
@@ -35,6 +35,7 @@ protected function _beforeToHtml()
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
index 322b3e5513e..15a4ee03a69 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -29,14 +29,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Items_Grid extends Mage_Adminhtml_
      */
     protected $_moveToCustomerStorage = true;
 
-    /**
-     * Class constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setId('sales_order_create_search_grid');
-    }
+    protected $_idFieldName = 'sales_order_create_search_grid';
 
     /**
      * Returns the items
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
index 5ad220a806f..4e04ac01d7f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
@@ -22,6 +22,10 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_View_History extends Mage_Adminhtml_Block_Template
 {
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $onclick = "submitAndReloadArea($('order_history_block').parentNode, '" . $this->getSubmitUrl() . "')";
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
index efee49fb06a..0da30a8ca15 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
@@ -22,17 +22,19 @@
  */
 class Mage_Adminhtml_Block_System_Cache_Edit extends Mage_Adminhtml_Block_Widget
 {
+    protected $_template = 'system/cache/edit.phtml';
+
     /**
      * Mage_Adminhtml_Block_System_Cache_Edit constructor.
      */
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('system/cache/edit.phtml');
         $this->setTitle('Cache Management');
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -49,14 +51,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
index c4a71bd2f2e..6da40c56e4b 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
@@ -26,6 +26,8 @@ class Mage_Adminhtml_Block_System_Config_Edit extends Mage_Adminhtml_Block_Widge
 
     protected $_section;
 
+    protected $_template = 'system/config/edit.phtml';
+
     /**
      * Mage_Adminhtml_Block_System_Config_Edit constructor.
      * @throws Exception
@@ -33,7 +35,6 @@ class Mage_Adminhtml_Block_System_Config_Edit extends Mage_Adminhtml_Block_Widge
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('system/config/edit.phtml');
 
         $sectionCode = $this->getRequest()->getParam('section');
         $sections = Mage::getSingleton('adminhtml/config')->getSections();
@@ -45,6 +46,7 @@ public function __construct()
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -61,14 +63,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
index c4c46b25e0c..85e0cc3fe5a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
@@ -27,11 +27,12 @@ class Mage_Adminhtml_Block_System_Config_Tabs extends Mage_Adminhtml_Block_Widge
      */
     protected $_tabs;
 
+    protected $_idFieldName = 'system_config_tabs';
+    protected $_template    = 'system/config/tabs.phtml';
+
     protected function _construct()
     {
-        $this->setId('system_config_tabs');
         $this->setTitle(Mage::helper('adminhtml')->__('Configuration'));
-        $this->setTemplate('system/config/tabs.phtml');
     }
 
     /**
@@ -54,16 +55,16 @@ public function initTabs()
 
         $configFields = Mage::getSingleton('adminhtml/config');
         $sections = $configFields->getSections($current);
-        $tabs     = (array)$configFields->getTabs()->children();
+        $tabs     = (array) $configFields->getTabs()->children();
 
-        $sections = (array)$sections;
+        $sections = (array) $sections;
 
         usort($sections, [$this, '_sort']);
         usort($tabs, [$this, '_sort']);
 
         foreach ($tabs as $tab) {
             $helperName = $configFields->getAttributeModule($tab);
-            $label = Mage::helper($helperName)->__((string)$tab->label);
+            $label = Mage::helper($helperName)->__((string) $tab->label);
 
             $this->addTab($tab->getName(), [
                 'label' => $label,
@@ -86,7 +87,7 @@ public function initTabs()
 
             $helperName = $configFields->getAttributeModule($section);
 
-            $label = Mage::helper($helperName)->__((string)$section->label);
+            $label = Mage::helper($helperName)->__((string) $section->label);
 
             if ($code == $current) {
                 if (!$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store')) {
@@ -96,8 +97,8 @@ public function initTabs()
                 }
             }
             if ($sectionAllowed && $hasChildren) {
-                $this->addSection($code, (string)$section->tab, [
-                    'class'     => (string)$section->class,
+                $this->addSection($code, (string) $section->tab, [
+                    'class'     => (string) $section->class,
                     'label'     => $label,
                     'url'       => $url->getUrl('*/*/*', ['_current' => true, 'section' => $code]),
                 ]);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
index 87d8435c228..b68ace08125 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -28,20 +28,13 @@ class Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard extends Mage_Admin
     protected $_removeMapButtonHtml;
     protected $_shortDateFormat;
 
+    protected $_template = 'system/convert/profile/wizard.phtml';
+
     /**
      * @var array
      */
     protected $_filterStores;
 
-    /**
-     * Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('system/convert/profile/wizard.phtml');
-    }
-
     /**
      * @return $this
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
index fd74b554886..666dd076a48 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
@@ -22,11 +22,7 @@
  */
 class Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Run extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('system/convert/profile/run.phtml');
-    }
+    protected $_template = 'system/convert/profile/run.phtml';
 
     public function getRunButtonHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
index 5a8d9524a22..48d4f1328e6 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
@@ -22,11 +22,15 @@
  */
 class Mage_Adminhtml_Block_System_Currency extends Mage_Adminhtml_Block_Template
 {
-    protected function _construct()
-    {
-        $this->setTemplate('system/currency/rates.phtml');
-    }
+    public const BUTTON_IMPORT          = 'import_button';
+    public const BLOCK_IMPORT_SERVICES  = 'import_services';
+    public const BLOCK_RATE_MATRIX      = 'rates_matrix';
+
+    protected $_template = 'system/currency/rates.phtml';
 
+    /**
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -60,12 +64,12 @@ protected function _prepareLayout()
         );
 
         $this->setChild(
-            'rates_matrix',
+            self::BLOCK_RATE_MATRIX,
             $this->getLayout()->createBlock('adminhtml/system_currency_rate_matrix')
         );
 
         $this->setChild(
-            'import_services',
+            self::BLOCK_IMPORT_SERVICES,
             $this->getLayout()->createBlock('adminhtml/system_currency_rate_services')
         );
 
@@ -77,29 +81,19 @@ protected function getHeader()
         return Mage::helper('adminhtml')->__('Manage Currency Rates');
     }
 
-    protected function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
-    protected function getResetButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
-    }
-
     protected function getImportButtonHtml()
     {
-        return $this->getChildHtml('import_button');
+        return $this->getChildHtml(self::BUTTON_IMPORT);
     }
 
     protected function getServicesHtml()
     {
-        return $this->getChildHtml('import_services');
+        return $this->getChildHtml(self::BLOCK_IMPORT_SERVICES);
     }
 
     protected function getRatesMatrixHtml()
     {
-        return $this->getChildHtml('rates_matrix');
+        return $this->getChildHtml(self::BLOCK_RATE_MATRIX);
     }
 
     protected function getImportFormAction()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php
index c8e15009e25..4d77e2e8051 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php
@@ -21,13 +21,17 @@
  */
 class Mage_Adminhtml_Block_System_Design extends Mage_Adminhtml_Block_Template
 {
+    public const BLOCK_GRID = 'grid';
+
+    public const BUTTON_ADD = 'add_new_button';
+
+    protected $_template = 'system/design/index.phtml';
+
     /**
      * @inheritDoc
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('system/design/index.phtml');
-
         $this->setChild(
             'add_new_button',
             $this->getLayout()->createBlock('adminhtml/widget_button')
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
index 884a9660cab..51c6503b6eb 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
@@ -21,14 +21,11 @@
  */
 class Mage_Adminhtml_Block_System_Design_Edit extends Mage_Adminhtml_Block_Widget
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('system/design/edit.phtml');
-        $this->setId('design_edit');
-    }
+    protected $_idFieldName = 'design_edit';
+    protected $_template    = 'system/design/edit.phtml';
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
index 1551cd6f79b..ede894165f6 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
@@ -22,14 +22,9 @@
  */
 class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Template
 {
-    /**
-     * Set transactional emails grid template
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->setTemplate('system/email/template/list.phtml');
-    }
+    public const BLOCK_GRID = 'grid';
+
+    protected $_template = 'system/email/template/list.phtml';
 
     /**
      * @inheritDoc
@@ -68,14 +63,4 @@ public function getHeaderText()
     {
         return Mage::helper('adminhtml')->__('Transactional Emails');
     }
-
-    /**
-     * Get Add New Template button html
-     *
-     * @return string
-     */
-    protected function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
index 436374814a8..fd54609d031 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -22,11 +22,14 @@
  */
 class Mage_Adminhtml_Block_System_Email_Template_Edit extends Mage_Adminhtml_Block_Widget
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('system/email/template/edit.phtml');
-    }
+    public const BLOCK_FORM         = 'form';
+    public const BUTTON_LOAD        = 'load_button';
+    public const BUTTON_PREVIEW     = 'preview_button';
+    public const BUTTON_TO_HTML     = 'to_html_button';
+    public const BUTTON_TO_PLAIN    = 'to_plain_button';
+    public const BUTTON_TOGGLE      = 'toggle_button';
+
+    protected $_template = 'system/email/template/edit.phtml';
 
     /**
      * @inheritDoc
@@ -142,7 +145,7 @@ protected function _prepareLayout()
         );
 
         $this->setChild(
-            'form',
+            self::BLOCK_FORM,
             $this->getLayout()->createBlock('adminhtml/system_email_template_edit_form')
         );
         return parent::_prepareLayout();
@@ -161,15 +164,7 @@ public function getBackButtonHtml()
      */
     public function getToggleButtonHtml()
     {
-        return $this->getChildHtml('toggle_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('reset_button');
+        return $this->getChildHtml(self::BUTTON_TOGGLE);
     }
 
     /**
@@ -177,7 +172,7 @@ public function getResetButtonHtml()
      */
     public function getToPlainButtonHtml()
     {
-        return $this->getChildHtml('to_plain_button');
+        return $this->getChildHtml(self::BUTTON_TO_PLAIN);
     }
 
     /**
@@ -185,15 +180,7 @@ public function getToPlainButtonHtml()
      */
     public function getToHtmlButtonHtml()
     {
-        return $this->getChildHtml('to_html_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
+        return $this->getChildHtml(self::BUTTON_TO_HTML);
     }
 
     /**
@@ -201,15 +188,7 @@ public function getSaveButtonHtml()
      */
     public function getPreviewButtonHtml()
     {
-        return $this->getChildHtml('preview_button');
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
+        return $this->getChildHtml(self::BUTTON_PREVIEW);
     }
 
     /**
@@ -217,7 +196,7 @@ public function getDeleteButtonHtml()
      */
     public function getLoadButtonHtml()
     {
-        return $this->getChildHtml('load_button');
+        return $this->getChildHtml(self::BUTTON_LOAD);
     }
 
     /**
@@ -250,7 +229,7 @@ public function getHeaderText()
      */
     public function getFormHtml()
     {
-        return $this->getChildHtml('form');
+        return $this->getChildHtml(self::BLOCK_FORM);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
index 4a9f28df3ce..a12b3ce2e2f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
@@ -22,12 +22,14 @@
  */
 class Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('tax/toolbar/rate/add.phtml');
-    }
+    public const BUTTON_ADD = 'addButton';
+
+    protected $_template = 'tax/toolbar/rate/add.phtml';
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
index 5359f65b7bc..c25e2fb9ca3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
@@ -23,6 +23,13 @@
  */
 class Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save extends Mage_Adminhtml_Block_Template
 {
+    public const BUTTON_BACK    = 'backButton';
+    public const BUTTON_DELETE  = 'deleteButton';
+    public const BUTTON_RESET   = 'resetButton';
+    public const BUTTON_SAVE    = 'saveButton';
+
+    protected $_template = 'tax/toolbar/rate/save.phtml';
+
     /**
      * Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save constructor.
      */
@@ -30,12 +37,11 @@ public function __construct()
     {
         parent::__construct();
         $this->assign('createUrl', $this->getUrl('*/tax_rate/save'));
-        $this->setTemplate('tax/toolbar/rate/save.phtml');
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
-     * @throws Exception
      */
     protected function _prepareLayout()
     {
@@ -83,37 +89,13 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('backButton');
-    }
-
-    /**
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('resetButton');
-    }
-
-    /**
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('saveButton');
-    }
-
-    /**
-     * @return string|void
+     * @inheritDoc
      * @throws Exception
      */
     public function getDeleteButtonHtml()
     {
         if ((int) $this->getRequest()->getParam('rate') == 0) {
-            return;
+            return '';
         }
         return $this->getChildHtml('deleteButton');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index 52d1aa7431c..b3e56c36a57 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -23,6 +23,8 @@
  */
 class Mage_Adminhtml_Block_Urlrewrite_Edit extends Mage_Adminhtml_Block_Widget_Container
 {
+    public const BUTTON_SKIP_CATEGORIES = 'skip_categories';
+
     /**
      * Part for building some blocks names
      *
@@ -90,7 +92,7 @@ protected function _prepareLayout()
                     $this->getLayout()->createBlock('adminhtml/urlrewrite_category_tree')
                 );
                 $this->setChild(
-                    'skip_categories',
+                    self::BUTTON_SKIP_CATEGORIES,
                     $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
                         'label'   => Mage::helper('adminhtml')->__('Skip Category Selection'),
                         'onclick' => 'window.location = \'' . Mage::helper('adminhtml')->getUrl('*/*/*', [
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php
index 4bfebfae3ff..4603ac32cd8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget.php
@@ -21,7 +21,7 @@
  * @package    Mage_Adminhtml
  *
  * @method $this setHeaderCss(string $value)
- * @method $this setTitle(string $value)
+ * @method $this setTitle(string $title)
  */
 class Mage_Adminhtml_Block_Widget extends Mage_Adminhtml_Block_Template
 {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index c953d82e637..4f867e7bc1b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -22,19 +22,28 @@
  */
 class Mage_Adminhtml_Block_Widget_Button extends Mage_Adminhtml_Block_Widget
 {
-    public function getType()
-    {
-        return ($type = $this->getData('type')) ? $type : 'button';
-    }
+    public const DATA_AFTER_HTML    = 'after_html';
+    public const DATA_BEFORE_HTML   = 'before_html';
+    public const DATA_CLASS         = 'class';
+    public const DATA_DISABLED      = 'disabled';
+    public const DATA_ELEMENT_NAME  = 'element_name';
+    public const DATA_LABEL         = 'label';
+    public const DATA_LEVEL         = 'level';
+    public const DATA_NAME          = 'name';
+    public const DATA_ON_CLICK      = 'on_click';
+    public const DATA_STYLE         = 'style';
+    public const DATA_TITLE         = 'title';
+    public const DATA_TYPE          = 'type';
+    public const DATA_VALUE         = 'value';
 
-    public function getOnClick()
-    {
-        if (!$this->getData('on_click')) {
-            return $this->getData('onclick');
-        }
-        return $this->getData('on_click');
-    }
+    public const TYPE_BUTTON = 'button';
+    public const TYPE_SUBMIT = 'submit';
 
+    /**
+     * Prepare html output
+     *
+     * @return string
+     */
     protected function _toHtml()
     {
         return $this->getBeforeHtml() . '<button '
@@ -51,4 +60,225 @@ protected function _toHtml()
             . ($this->getDisabled() ? ' disabled="disabled"' : '')
             . '><span><span><span>' . $this->getLabel() . '</span></span></span></button>' . $this->getAfterHtml();
     }
+
+    public function getAfterHtml(): ?string
+    {
+        return $this->getDataByKey(self::DATA_AFTER_HTML);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setAfterHtml(string $html)
+    {
+        return $this->setData(self::DATA_AFTER_HTML, $html);
+    }
+
+    public function getBeforeHtml(): ?string
+    {
+        return $this->getDataByKey(self::DATA_BEFORE_HTML);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setBeforeHtml(string $html)
+    {
+        return $this->setData(self::DATA_BEFORE_HTML, $html);
+    }
+
+    public function getClass(): ?string
+    {
+        return $this->getDataByKey(self::DATA_CLASS);
+    }
+
+    /**
+     * @param Mage_Adminhtml_Block_Template::BUTTON__CLASS_* $class
+     * @return $this
+     */
+    public function setClass(string $class)
+    {
+        return $this->setData(self::DATA_CLASS, $class);
+    }
+
+    /**
+     * Add custmom html class
+     *
+     * @return $this
+     */
+    public function addClass(string $class)
+    {
+        $curentClass = $this->getDataByKey(self::DATA_CLASS);
+        return $this->setData(self::DATA_CLASS, trim($curentClass) . ' ' . trim($class));
+    }
+
+    /**
+     * Reset html class to empty
+     *
+     * @return $this
+     */
+    public function resetClass()
+    {
+        return $this->setData(self::DATA_CLASS, '');
+    }
+
+    public function getDisabled(): ?bool
+    {
+        return $this->getDataByKey(self::DATA_DISABLED);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setDisabled(bool $value)
+    {
+        return $this->setData(self::DATA_DISABLED, $value);
+    }
+
+    public function getElementName(): ?string
+    {
+        return $this->getDataByKey(self::DATA_ELEMENT_NAME);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setElementName(string $name)
+    {
+        return $this->setData(self::DATA_ELEMENT_NAME, $name);
+    }
+
+    public function getLabel(): ?string
+    {
+        return $this->getDataByKey(self::DATA_LABEL);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setLabel(string $label)
+    {
+        return $this->setData(self::DATA_LABEL, $label);
+    }
+
+    public function getLevel(): int
+    {
+        return $this->getDataByKey(self::DATA_LEVEL);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setLevel(int $level)
+    {
+        return $this->setData(self::DATA_LEVEL, $level);
+    }
+
+    public function getName(): ?string
+    {
+        return $this->getDataByKey(self::DATA_NAME);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setName(string $name)
+    {
+        return $this->setData(self::DATA_NAME, $name);
+    }
+
+    /**
+     * @return string
+     */
+    public function getOnClick()
+    {
+        if (!$this->getDataByKey(self::DATA_ON_CLICK)) {
+            return $this->getDataByKey('onclick');
+        }
+        return $this->getDataByKey(self::DATA_ON_CLICK);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setOnClick(string $string)
+    {
+        return $this->setData(self::DATA_ON_CLICK, $string);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setOnClickSetLocationJsUrl(string $route = '*/*/', array $params = [])
+    {
+        $url = Mage::helper('core/js')->getSetLocationJs($this->getUrl($route, $params));
+        return $this->setOnClick($url);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setOnClickSetLocationJsFullUrl(string $url)
+    {
+        $url = Mage::helper('core/js')->getSetLocationJs($url);
+        return $this->setOnClick($url);
+    }
+
+    public function getStyle(): ?string
+    {
+        return $this->getDataByKey(self::DATA_STYLE);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setStyle(string $style)
+    {
+        return $this->setData(self::DATA_STYLE, $style);
+    }
+
+    public function getTitle(): ?string
+    {
+        return $this->getDataByKey(self::DATA_TITLE);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setTitle(string $title)
+    {
+        return $this->setData(self::DATA_TITLE, $title);
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return ($type = $this->getDataByKey(self::DATA_TYPE)) ? $type : self::TYPE_BUTTON;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setType(string $type)
+    {
+        return $this->setData(self::DATA_TYPE, $type);
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->getDataByKey(self::DATA_VALUE);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setValue(string $value)
+    {
+        return $this->setData(self::DATA_VALUE, $value);
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
index 0c8cdda9ed4..217224ae8be 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
@@ -24,10 +24,7 @@ class Mage_Adminhtml_Block_Widget_Form_Element_Gallery extends Mage_Adminhtml_Bl
 {
     protected $_element = null;
 
-    public function __construct()
-    {
-        $this->setTemplate('widget/form/element/gallery.phtml');
-    }
+    protected $_template = 'widget/form/element/gallery.phtml';
 
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
@@ -51,6 +48,10 @@ public function getValues()
         return $this->getElement()->getValue();
     }
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
         $this->setChild(
@@ -75,11 +76,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
-
     public function getDeleteButtonHtml($image)
     {
         return str_replace('#image#', $image, $this->getChildHtml('delete_button'));
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index a8f3aa67c6d..b73edfef156 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -25,6 +25,10 @@
  */
 class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget
 {
+    public const BUTTON_EXPORT          = 'export_button';
+    public const BUTTON_RESET_FILTER    = 'reset_filter_button';
+    public const BUTTON_SEARCH          = 'search_button';
+
     /**
      * Columns array
      *
@@ -214,6 +218,8 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget
      */
     protected ?array $defaultColumnSettings = null;
 
+    protected $_template = 'widget/grid.phtml';
+
     /**
      * Mage_Adminhtml_Block_Widget_Grid constructor.
      * @param array $attributes
@@ -221,12 +227,12 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget
     public function __construct($attributes = [])
     {
         parent::__construct($attributes);
-        $this->setTemplate('widget/grid.phtml');
         $this->setRowClickCallback('openGridRow');
         $this->_emptyText = Mage::helper('adminhtml')->__('No records found.');
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -265,7 +271,7 @@ protected function _prepareLayout()
      */
     public function getExportButtonHtml()
     {
-        return $this->getChildHtml('export_button');
+        return $this->getChildHtml(self::BUTTON_EXPORT);
     }
 
     /**
@@ -273,7 +279,7 @@ public function getExportButtonHtml()
      */
     public function getResetFilterButtonHtml()
     {
-        return $this->getChildHtml('reset_filter_button');
+        return $this->getChildHtml(self::BUTTON_RESET_FILTER);
     }
 
     /**
@@ -281,7 +287,7 @@ public function getResetFilterButtonHtml()
      */
     public function getSearchButtonHtml()
     {
-        return $this->getChildHtml('search_button');
+        return $this->getChildHtml(self::BUTTON_SEARCH);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
index e3df83322eb..d46b0890230 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
@@ -56,7 +56,7 @@ public function __construct()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
index 7c3d53d8ef5..a1c4a57afce 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
@@ -74,7 +74,7 @@ public function massDeleteAction()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function preDispatch()
     {
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
index 82041b7b27e..432310e262a 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
@@ -22,16 +22,14 @@
  */
 class Mage_Api2_Block_Adminhtml_Attribute_Buttons extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('api2/attribute/buttons.phtml');
-    }
+    public const BUTTON_BACK    = 'backButton';
+    public const BUTTON_SAVE    = 'saveButton';
+
+    protected $_template = 'api2/attribute/buttons.phtml';
 
     /**
-     * Prepare global layout
-     *
-     * @return Mage_Core_Block_Abstract
+     * @codeCoverageIgnore
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
@@ -56,36 +54,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * Get back button HTML
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('backButton');
-    }
-
-    /**
-     * Get reset button HTML
-     *
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('resetButton');
-    }
-
-    /**
-     * Get save button HTML
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('saveButton');
-    }
-
     /**
      * Get block caption
      *
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
index 9f070afad49..037f87fdf9a 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
@@ -25,15 +25,15 @@
  */
 class Mage_Api2_Block_Adminhtml_Roles_Buttons extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('api2/role/buttons.phtml');
-    }
+    public const BUTTON_BACK    = 'backButton';
+    public const BUTTON_DELETE  = 'deleteButton';
+    public const BUTTON_RESET   = 'resetButton';
+    public const BUTTON_SAVE    = 'saveButton';
+
+    protected $_template = 'api2/role/buttons.phtml';
 
     /**
-     * Preparing global layout
-     *
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -69,39 +69,7 @@ protected function _prepareLayout()
     }
 
     /**
-     * Get back button HTML
-     *
-     * @return string
-     */
-    public function getBackButtonHtml()
-    {
-        return $this->getChildHtml('backButton');
-    }
-
-    /**
-     * Get reset button HTML
-     *
-     * @return string
-     */
-    public function getResetButtonHtml()
-    {
-        return $this->getChildHtml('resetButton');
-    }
-
-    /**
-     * Get save button HTML
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('saveButton');
-    }
-
-    /**
-     * Get delete button HTML
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getDeleteButtonHtml()
     {
@@ -111,7 +79,7 @@ public function getDeleteButtonHtml()
             return '';
         }
 
-        $this->getChild('deleteButton')->setData('onclick', sprintf(
+        $this->getChild(self::BUTTON_DELETE)->setData('onclick', sprintf(
             "if(confirm('%s')) roleForm.submit('%s'); return false;",
             Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Are you sure you want to do this?')),
             $this->getUrl('*/*/delete')
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 4ace45a9e3c..8c20bd121fb 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -22,12 +22,16 @@
  */
 class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
+    public const BLOCK_OPTION_BOX = 'options_box';
+
     protected $_product = null;
+
+    protected $_template = 'bundle/product/edit/bundle.phtml';
+
     public function __construct()
     {
         parent::__construct();
         $this->setSkipGenerateContent(true);
-        $this->setTemplate('bundle/product/edit/bundle.phtml');
     }
 
     /**
@@ -47,14 +51,12 @@ public function getTabClass()
     }
 
     /**
-     * Prepare layout
-     *
      * @inheritDoc
      */
     protected function _prepareLayout()
     {
         $this->setChild(
-            'add_button',
+            self::BLOCK_OPTION_BOX,
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData([
                     'label' => Mage::helper('bundle')->__('Add New Option'),
@@ -65,7 +67,7 @@ protected function _prepareLayout()
         );
 
         $this->setChild(
-            'options_box',
+            self::BLOCK_OPTION_BOX,
             $this->getLayout()->createBlock(
                 'bundle/adminhtml_catalog_product_edit_tab_bundle_option',
                 'adminhtml.catalog.product.edit.tab.bundle.option'
@@ -85,20 +87,12 @@ public function isReadonly()
         return $this->getProduct()->getCompositeReadonly();
     }
 
-    /**
-     * @return string
-     */
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
-
     /**
      * @return string
      */
     public function getOptionsBoxHtml()
     {
-        return $this->getChildHtml('options_box');
+        return $this->getChildHtml(self::BLOCK_OPTION_BOX);
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 15e527d5f07..3e7bf5110fd 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -27,6 +27,12 @@
  */
 class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends Mage_Adminhtml_Block_Widget
 {
+    public const BLOCK_SELCTION_TEMPLATE = 'selection_template';
+
+    public const BUTTON_ADD_SELECTION   = 'add_selection_button';
+    public const BUTTON_CLOSE_SEARCH    = 'close_search_button';
+    public const BUTTON_OPTION_DELETE   = 'option_delete_button';
+
     /**
      * Form element
      *
@@ -57,6 +63,8 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends
      */
     protected $_options = null;
 
+    protected $_template = 'bundle/product/edit/bundle/option.phtml';
+
     /**
      * Bundle option renderer class constructor
      *
@@ -64,7 +72,6 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends
      */
     public function __construct()
     {
-        $this->setTemplate('bundle/product/edit/bundle/option.phtml');
         $this->setCanReadPrice(true);
         $this->setCanEditPrice(true);
     }
@@ -138,7 +145,7 @@ public function isMultiWebsites()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'add_selection_button',
+            self::BLOCK_SELCTION_TEMPLATE,
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData([
                     'id'    => $this->getFieldId() . '_{{index}}_add_button',
@@ -190,7 +197,7 @@ public function getAddButtonHtml()
      */
     public function getCloseSearchButtonHtml()
     {
-        return $this->getChildHtml('close_search_button');
+        return $this->getChildHtml(self::BUTTON_CLOSE_SEARCH);
     }
 
     /**
@@ -198,7 +205,7 @@ public function getCloseSearchButtonHtml()
      */
     public function getAddSelectionButtonHtml()
     {
-        return $this->getChildHtml('add_selection_button');
+        return $this->getChildHtml(self::BUTTON_ADD_SELECTION);
     }
 
     /**
@@ -249,7 +256,7 @@ public function getAddButtonId()
     {
         return $this->getLayout()
                 ->getBlock('admin.product.bundle.items')
-                ->getChild('add_button')->getId();
+                ->getChild(self::BUTTON_ADD)->getId();
     }
 
     /**
@@ -257,7 +264,7 @@ public function getAddButtonId()
      */
     public function getOptionDeleteButtonHtml()
     {
-        return $this->getChildHtml('option_delete_button');
+        return $this->getChildHtml(self::BUTTON_OPTION_DELETE);
     }
 
     /**
@@ -265,7 +272,7 @@ public function getOptionDeleteButtonHtml()
      */
     public function getSelectionHtml()
     {
-        return $this->getChildHtml('selection_template');
+        return $this->getChildHtml(self::BLOCK_SELCTION_TEMPLATE);
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index 4429cdad382..85dc7f915f7 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -27,11 +27,10 @@
  */
 class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search extends Mage_Adminhtml_Block_Widget
 {
-    protected function _construct()
-    {
-        $this->setId('bundle_option_selection_search');
-        $this->setTemplate('bundle/product/edit/bundle/option/search.phtml');
-    }
+    public const BLOCK_GRID = 'grid';
+
+    protected $_idFieldName = 'bundle_option_selection_search';
+    protected $_template    = 'bundle/product/edit/bundle/option/search.phtml';
 
     /**
      * @return string
@@ -47,7 +46,7 @@ public function getHeaderText()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'grid',
+            self::BLOCK_GRID,
             $this->getLayout()->createBlock(
                 'bundle/adminhtml_catalog_product_edit_tab_bundle_option_search_grid',
                 'adminhtml.catalog.product.edit.tab.bundle.option.search.grid'
@@ -61,7 +60,8 @@ protected function _prepareLayout()
      */
     protected function _beforeToHtml()
     {
-        $this->getChild('grid')->setIndex($this->getIndex())
+        $this->getChild(self::BLOCK_GRID)
+            ->setIndex($this->getIndex())
             ->setFirstShow($this->getFirstShow());
 
         return parent::_beforeToHtml();
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 616d608bb55..20cd78554a1 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -27,12 +27,15 @@
  */
 class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection extends Mage_Adminhtml_Block_Widget
 {
+    public const BUTTON_SELECTION_DELETE = 'selection_delete_button';
+
+    protected $_template = 'bundle/product/edit/bundle/option/selection.phtml';
+
     /**
      * Initialize bundle option selection block
      */
     public function __construct()
     {
-        $this->setTemplate('bundle/product/edit/bundle/option/selection.phtml');
         $this->setCanReadPrice(true);
         $this->setCanEditPrice(true);
     }
@@ -58,8 +61,7 @@ public function getFieldName()
     }
 
     /**
-     * Prepare block layout
-     *
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -83,7 +85,7 @@ protected function _prepareLayout()
      */
     public function getSelectionDeleteButtonHtml()
     {
-        return $this->getChildHtml('selection_delete_button');
+        return $this->getChildHtml(self::BUTTON_SELECTION_DELETE);
     }
 
     /**
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index 22dcf707e39..f20629bb795 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -28,13 +28,11 @@
  * @method $this setCacheLifetime(int|false $value)
  * @method $this setCacheKey(string $value)
  * @method $this setCacheTags(array $value)
- * @method $this setClass(string $value)
+ * @method $this setClass(string $class)
  * @method $this setDisabled(bool $value)
- * @method $this setLabel(string $value)
- * @method $this setOnclick(string $value)
  * @method string getPosition()
  * @method $this setTemplate(string $value)
- * @method $this setType(string $value)
+ * @method $this setType(string $type)
  * @method bool hasWrapperMustBeVisible()
  */
 abstract class Mage_Core_Block_Abstract extends Varien_Object
@@ -300,7 +298,7 @@ public function setLayout(Mage_Core_Model_Layout $layout)
     }
 
     /**
-     * Preparing global layout
+     * Preparing global layout, adding buttons
      *
      * You can redefine this method in child classes for changing layout
      *
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php
index 8600c471c80..94ffa9b0dc2 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php
@@ -62,7 +62,7 @@ public function __construct()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _convert($currencyFrom, $currencyTo)
     {
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php
index 8a8b77ccd6c..fcd3fbade5f 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php
@@ -62,7 +62,7 @@ public function __construct()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _convert($currencyFrom, $currencyTo)
     {
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 5b11a5e26e1..46575233f05 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -33,13 +33,14 @@ class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Li
      */
     protected $_purchasedSeparatelyAttribute = null;
 
+    protected $_template = 'downloadable/product/edit/downloadable/links.phtml';
+
     /**
      * Class constructor
      */
     public function __construct()
     {
         parent::__construct();
-        $this->setTemplate('downloadable/product/edit/downloadable/links.phtml');
         $this->setCanEditPrice(true);
         $this->setCanReadPrice(true);
     }
@@ -242,8 +243,7 @@ public function getConfigMaxDownloads()
     }
 
     /**
-     * Prepare block Layout
-     *
+     * @return $this
      */
     protected function _prepareLayout()
     {
@@ -271,7 +271,7 @@ protected function _prepareLayout()
      */
     public function getUploadButtonHtml()
     {
-        return $this->getChild('upload_button')->toHtml();
+        return $this->getChild(self::BUTTON_UPLOAD)->toHtml();
     }
 
     /**
@@ -300,7 +300,7 @@ public function getConfigJson($type = 'links')
      */
     public function getBrowseButtonHtml($type = '')
     {
-        return $this->getChild('browse_button')
+        return $this->getChild(self::BUTTON_BROWSE)
             // Workaround for IE9
             ->setBeforeHtml(
                 '<div style="display:inline-block; " id="downloadable_link_{{id}}_' . $type . 'file-browse">'
@@ -316,7 +316,9 @@ public function getBrowseButtonHtml($type = '')
      */
     public function getDeleteButtonHtml($type = '')
     {
-        return $this->getChild('delete_button')
+        /** @var Mage_Adminhtml_Block_Widget_Button $block */
+        $block = $this->getChild(self::BUTTON_DELETE);
+        return $block
             ->setLabel('')
             ->setId('downloadable_link_{{id}}_' . $type . 'file-delete')
             ->setStyle('display:none; width:31px;')
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 0f7966bd9b8..5234ea895d9 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -22,14 +22,7 @@
  */
 class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples extends Mage_Uploader_Block_Single
 {
-    /**
-     * Class constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('downloadable/product/edit/downloadable/samples.phtml');
-    }
+    protected $_template = 'downloadable/product/edit/downloadable/samples.phtml';
 
     /**
      * Get model of the product that is being edited
@@ -133,8 +126,7 @@ public function getSamplesTitle()
     }
 
     /**
-     * Prepare layout
-     *
+     * @$this
      */
     protected function _prepareLayout()
     {
@@ -164,7 +156,7 @@ protected function _prepareLayout()
      */
     public function getUploadButtonHtml()
     {
-        return $this->getChild('upload_button')->toHtml();
+        return $this->getChild(self::BUTTON_UPLOAD)->toHtml();
     }
 
     /**
@@ -191,7 +183,7 @@ public function getConfigJson()
      */
     public function getBrowseButtonHtml()
     {
-        return $this->getChild('browse_button')
+        return $this->getChild(self::BUTTON_BROWSE)
             // Workaround for IE9
             ->setBeforeHtml('<div style="display:inline-block; " id="downloadable_sample_{{id}}_file-browse">')
             ->setAfterHtml('</div>')
@@ -204,7 +196,9 @@ public function getBrowseButtonHtml()
      */
     public function getDeleteButtonHtml()
     {
-        return $this->getChild('delete_button')
+        /** @var Mage_Adminhtml_Block_Widget_Button $block */
+        $block = $this->getChild(self::BUTTON_DELETE);
+        return $block
             ->setLabel('')
             ->setId('downloadable_sample_{{id}}_file-delete')
             ->setStyle('display:none; width:31px;')
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index a6ad1599183..3da3b71c1c2 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
@@ -22,15 +22,10 @@
  */
 abstract class Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract extends Mage_Adminhtml_Block_Widget
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('eav/attribute/options.phtml');
-    }
+    protected $_template = 'eav/attribute/options.phtml';
 
     /**
-     * Preparing layout, adding buttons
-     *
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
@@ -56,16 +51,6 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    /**
-     * Retrieve HTML of delete button
-     *
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
-    }
-
     /**
      * Retrieve HTML of add button
      *
@@ -73,7 +58,7 @@ public function getDeleteButtonHtml()
      */
     public function getAddNewButtonHtml()
     {
-        return $this->getChildHtml('add_button');
+        return $this->getChildHtml(self::BUTTON_ADD);
     }
 
     /**
diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
index df1d456f6c2..ad13128b9c5 100644
--- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
+++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
@@ -23,7 +23,7 @@
 class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator extends Zend_Validate_InArray
 {
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     protected $_messageTemplates;
 
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
index 10c8c725796..36b1e9511cd 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php
@@ -36,7 +36,7 @@ public function __construct()
                 $this->getUrl('*/*/fetch'),
                 Mage::helper('paypal')->__('Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?')
             ),
-            'class'   => 'task'
+            'class'   => self::BUTTON__CLASS_TASK
         ]);
     }
 
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
index cb5b7fb9b26..069d6557cf9 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
@@ -90,8 +90,8 @@ public function setPeriod($period)
     /**
      * Set interval
      *
-     * @param int $from
-     * @param int $to
+     * @param Zend_Date|int $from
+     * @param Zend_Date|int $to
      * @return $this
      */
     public function setInterval($from, $to)
diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
index dc155629fae..d0c758e0dd0 100644
--- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php
+++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
@@ -73,7 +73,7 @@ protected function _construct()
     /**
      * Set created_at parameter
      *
-     * @inheritdoc
+     * @inheritDoc
      */
     protected function _beforeSave()
     {
diff --git a/app/code/core/Mage/Uploader/Block/Abstract.php b/app/code/core/Mage/Uploader/Block/Abstract.php
index db138d53f8d..c4d46a71923 100644
--- a/app/code/core/Mage/Uploader/Block/Abstract.php
+++ b/app/code/core/Mage/Uploader/Block/Abstract.php
@@ -22,6 +22,8 @@
  */
 abstract class Mage_Uploader_Block_Abstract extends Mage_Adminhtml_Block_Widget
 {
+    public const BUTTON_BROWSE = 'browse_button';
+
     /**
      * Template used for uploader
      *
@@ -169,17 +171,7 @@ protected function _prepareLayout()
      */
     public function getBrowseButtonHtml()
     {
-        return $this->getChildHtml('browse_button');
-    }
-
-    /**
-     * Get delete button html
-     *
-     * @return string
-     */
-    public function getDeleteButtonHtml()
-    {
-        return $this->getChildHtml('delete_button');
+        return $this->getChildHtml(self::BUTTON_BROWSE);
     }
 
     /**
diff --git a/app/code/core/Mage/Uploader/Block/Multiple.php b/app/code/core/Mage/Uploader/Block/Multiple.php
index 3fe4828c9b1..48972c81215 100644
--- a/app/code/core/Mage/Uploader/Block/Multiple.php
+++ b/app/code/core/Mage/Uploader/Block/Multiple.php
@@ -45,14 +45,4 @@ protected function _prepareLayout()
 
         return $this;
     }
-
-    /**
-     * Get upload button html
-     *
-     * @return string
-     */
-    public function getUploadButtonHtml()
-    {
-        return $this->getChildHtml('upload_button');
-    }
 }
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
index 65ec189f692..488dff408e3 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
@@ -270,7 +270,7 @@ public function getResult()
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      * Starting from 23.02.2018 USPS doesn't allow to create free shipping labels via their API.
      */
     public function isShippingLabelsAvailable()
diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
index ccdbb041155..62ec981fe07 100644
--- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
@@ -43,13 +43,7 @@ class Mage_Weee_Block_Renderer_Weee_Tax extends Mage_Adminhtml_Block_Widget impl
      */
     protected $_websites = null;
 
-    /**
-     * Public constructor
-     */
-    public function __construct()
-    {
-        $this->setTemplate('weee/renderer/tax.phtml');
-    }
+    protected $_template = 'weee/renderer/tax.phtml';
 
     /**
      * Retrieve product in question
@@ -212,7 +206,7 @@ public function getWebsites()
     protected function _setAddButton()
     {
         $this->setChild(
-            'add_button',
+            self::BUTTON_ADD,
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData(['id' => 'add_tax_' . $this->getElement()->getHtmlId(),
                 'label' => Mage::helper('catalog')->__('Add Tax'),
@@ -221,14 +215,4 @@ protected function _setAddButton()
                 ])
         );
     }
-
-    /**
-     * Retrieve add button html
-     *
-     * @return string
-     */
-    public function getAddButtonHtml()
-    {
-        return $this->getChildHtml('add_button');
-    }
 }
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 1f8fff377f0..cf342ac0727 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -30,14 +30,7 @@ class Mage_Widget_Block_Adminhtml_Widget_Instance_Edit_Tab_Main_Layout extends M
      */
     protected $_element = null;
 
-    /**
-     * Internal constructor
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->setTemplate('widget/instance/edit/layout.phtml');
-    }
+    protected $_template = 'widget/instance/edit/layout.phtml';
 
     /**
      * Render given element (return html of element)
@@ -155,6 +148,8 @@ protected function _getDisplayOnOptions()
                 ]
             ]
         ];
+
+        $productsOptions = [];
         foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
             $productsOptions[] = [
                'value' => $typeId . '_products',
@@ -237,13 +232,13 @@ public function getDisplayOnContainers()
      */
     public function getLayoutsChooser()
     {
-        $layouts = $this->getLayout()
+        return $this->getLayout()
             ->createBlock('widget/adminhtml_widget_instance_edit_chooser_layout')
             ->setSelectName('widget_instance[{{id}}][pages][layout_handle]')
             ->setArea($this->getWidgetInstance()->getArea())
             ->setPackage($this->getWidgetInstance()->getPackage())
-            ->setTheme($this->getWidgetInstance()->getTheme());
-        return $layouts->toHtml();
+            ->setTheme($this->getWidgetInstance()->getTheme())
+            ->toHtml();
     }
 
     /**
diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
index 2ad6a2fbc4b..a2baa9a2de1 100644
--- a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Widget_Form_Element_Gallery $this */
 ?>
 <tr>
 <td colspan="2">
@@ -28,7 +30,7 @@
 
 <tfoot class="gallery">
 <tr class="gallery">
-<td class="gallery v-middle a-left"colspan="5"><?php echo $this->getAddButtonHtml() ?></td>
+<td class="gallery v-middle a-left" colspan="5"><?php echo $this->getAddButtonHtml() ?></td>
 </tr>
 </tfoot>
 
@@ -77,7 +79,7 @@ function addNewImage()
     new_row_input.value = '0';
 
     // Delete button
-    new_row_button = '<?php echo $this->getDeleteButtonHtml("this") ?>';
+    new_row_button = '<?php echo $this->getDeleteImageButtonHtml('this') ?>';
 
     table = document.getElementById( "gallery" );
 

From 8946172cc7af8c42e15bb97fb01b12c62130a46e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Dec 2024 22:49:18 +0100
Subject: [PATCH 03/10] refactor + tests

- moved create button code from _prepareLayout to its own methods
- added tests
---
 .../core/Mage/Adminhtml/Block/Api/Buttons.php | 103 +++++----
 .../Block/Catalog/Category/Edit/Form.php      |  58 ++---
 .../Block/Catalog/Category/Tab/Attributes.php |   6 +-
 .../Adminhtml/Block/Catalog/Category/Tree.php |  55 ++---
 .../Product/Attribute/New/Product/Created.php |  23 +-
 .../Catalog/Product/Attribute/Set/Main.php    | 122 +++++-----
 .../Attribute/Set/Main/Formattribute.php      |  15 +-
 .../Product/Attribute/Set/Main/Formgroup.php  |  15 +-
 .../Product/Attribute/Set/Toolbar/Add.php     |  44 ++--
 .../Product/Attribute/Set/Toolbar/Main.php    |  25 +-
 .../Block/Catalog/Product/Created.php         |  24 +-
 .../Adminhtml/Block/Catalog/Product/Edit.php  | 117 +++++-----
 .../Catalog/Product/Edit/Action/Attribute.php |  62 +++--
 .../Catalog/Product/Edit/Tab/Options.php      |  26 ++-
 .../Product/Edit/Tab/Options/Option.php       |  25 +-
 .../Product/Edit/Tab/Options/Type/Select.php  |  44 ++--
 .../Catalog/Product/Edit/Tab/Price/Group.php  |  26 ++-
 .../Catalog/Product/Edit/Tab/Price/Tier.php   |  26 ++-
 .../Catalog/Product/Edit/Tab/Settings.php     |  25 +-
 .../Catalog/Product/Edit/Tab/Super/Config.php |  45 ++--
 .../Product/Edit/Tab/Super/Settings.php       |  43 ++--
 .../Block/Customer/Edit/Tab/Addresses.php     |  82 ++++---
 .../Sales/Order/Address/Form/Renderer/Vat.php |  12 +-
 .../Adminhtml/Block/Newsletter/Problem.php    |  45 ++--
 .../Adminhtml/Block/Newsletter/Queue/Edit.php |  99 ++++----
 .../Block/Newsletter/Template/Edit.php        | 145 ++++++------
 .../Adminhtml/Block/Permissions/Buttons.php   |  79 +++----
 .../core/Mage/Adminhtml/Block/Report/Grid.php |  41 ++--
 .../Block/Sales/Order/Comments/View.php       |  24 +-
 .../Block/Sales/Order/Create/Customer.php     |  30 +--
 .../Block/Sales/Order/Create/Items.php        |   2 +-
 .../Block/Sales/Order/Create/Items/Grid.php   |   2 +-
 .../Block/Sales/Order/Create/Search.php       |  16 +-
 .../Block/Sales/Order/Create/Sidebar.php      |  23 +-
 .../Block/Sales/Order/Create/Sidebar/Cart.php |  32 ++-
 .../Sales/Order/Creditmemo/Create/Items.php   |  68 +++---
 .../Sales/Order/Invoice/Create/Items.php      |  51 +++--
 .../Sales/Order/Invoice/Create/Tracking.php   |  34 +--
 .../Sales/Order/Shipment/Create/Items.php     |  27 +--
 .../Sales/Order/Shipment/Create/Tracking.php  |  26 ++-
 .../Sales/Order/Shipment/View/Tracking.php    |  37 ++-
 .../Block/Sales/Order/View/Giftmessage.php    |  25 +-
 .../Block/Sales/Order/View/History.php        |  26 ++-
 .../Adminhtml/Block/System/Cache/Edit.php     |  25 +-
 .../Adminhtml/Block/System/Config/Edit.php    |  25 +-
 .../System/Storage/Media/Synchronize.php      |  15 +-
 .../Adminhtml/Block/System/Config/Tabs.php    |  81 ++++---
 .../System/Convert/Gui/Edit/Tab/Wizard.php    |  14 +-
 .../System/Convert/Profile/Edit/Tab/Run.php   |   6 +-
 .../Mage/Adminhtml/Block/System/Currency.php  |  64 +++---
 .../Mage/Adminhtml/Block/System/Design.php    |  29 ++-
 .../Adminhtml/Block/System/Design/Edit.php    |  56 ++---
 .../Adminhtml/Block/System/Email/Template.php |  27 ++-
 .../Block/System/Email/Template/Edit.php      | 177 ++++++--------
 .../Block/System/Store/Delete/Group.php       |  72 +++---
 .../Block/System/Store/Delete/Website.php     |  74 +++---
 .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php  |  25 +-
 .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php |  70 +++---
 .../core/Mage/Adminhtml/Block/Template.php    |   5 +-
 .../Mage/Adminhtml/Block/Urlrewrite/Edit.php  |  30 +--
 app/code/core/Mage/Adminhtml/Block/Widget.php |  14 +-
 .../Mage/Adminhtml/Block/Widget/Container.php |   2 +-
 .../Block/Widget/Form/Element/Gallery.php     |  46 ++--
 .../core/Mage/Adminhtml/Block/Widget/Grid.php |  60 ++---
 .../Block/Adminhtml/Attribute/Buttons.php     |  38 ++--
 .../Api2/Block/Adminhtml/Roles/Buttons.php    |  66 +++---
 .../Catalog/Product/Edit/Tab/Bundle.php       |  28 ++-
 .../Product/Edit/Tab/Bundle/Option.php        |  68 +++---
 .../Product/Edit/Tab/Bundle/Option/Search.php |  12 +-
 .../Edit/Tab/Bundle/Option/Selection.php      |  25 +-
 .../Block/Adminhtml/System/Currencysymbol.php |  13 +-
 .../Product/Edit/Tab/Downloadable/Links.php   |  44 ++--
 .../Product/Edit/Tab/Downloadable/Samples.php |  40 ++--
 .../Attribute/Edit/Options/Abstract.php       |  41 ++--
 .../core/Mage/Uploader/Block/Abstract.php     |  66 +++---
 .../core/Mage/Uploader/Block/Multiple.php     |  27 ++-
 .../Mage/Weee/Block/Renderer/Weee/Tax.php     |  10 +-
 .../Widget/Block/Adminhtml/Widget/Chooser.php |   6 +-
 .../Widget/Instance/Edit/Tab/Main/Layout.php  |  22 +-
 .../Mage/Adminhtml/Block/Api/ButtonsTest.php  | 116 ++++++++++
 tests/unit/Mage/Adminhtml/Block/CacheTest.php |   1 -
 .../Block/Catalog/Category/Edit/FormTest.php  | 101 ++++++++
 .../Block/Catalog/Category/TreeTest.php       |  82 +++++++
 .../Attribute/Set/Main/FormattributeTest.php  |  58 +++++
 .../Attribute/Set/Main/FormgroupTest.php      |  58 +++++
 .../Product/Attribute/Set/Main/MainTest.php   | 175 ++++++++++++++
 .../Product/Attribute/Set/Toolbar/AddTest.php |  77 +++++++
 .../Attribute/Set/Toolbar/MainTest.php        |  58 +++++
 .../Attribute/_New/Product/CreatedTest.php    |  61 +++++
 .../Block/Catalog/Product/CreatedTest.php     |  58 +++++
 .../Product/Edit/Actions/AttributeTest.php    |  96 ++++++++
 .../Edit/Tab/Bundle/Option/SelectionTest.php  |  58 +++++
 .../Product/Edit/Tab/Options/OptionTest.php   |  58 +++++
 .../Edit/Tab/Options/Type/SelectTest.php      |  79 +++++++
 .../Catalog/Product/Edit/Tab/OptionsTest.php  |  57 +++++
 .../Product/Edit/Tab/Price/GroupTest.php      |  58 +++++
 .../Product/Edit/Tab/Price/TierTest.php       |  59 +++++
 .../Catalog/Product/Edit/Tab/SettingsTest.php |  72 ++++++
 .../Product/Edit/Tab/Super/ConfigTest.php     |  77 +++++++
 .../Product/Edit/Tab/Super/SettingsTest.php   |  77 +++++++
 .../Block/Catalog/Product/EditTest.php        | 175 ++++++++++++++
 .../Block/Customer/Edit/Tab/AddressesTest.php |  83 ++++++-
 .../Block/Newsletter/ProblemTest.php          |  96 ++++++++
 .../Block/Newsletter/Queue/EditTest.php       | 134 +++++++++++
 .../Block/Newsletter/Template/EditTest.php    | 194 ++++++++++++++++
 .../Block/Permissions/ButtonsTest.php         | 115 ++++++++++
 .../Mage/Adminhtml/Block/Report/GridTest.php  |  99 ++++++++
 .../Block/Sales/Order/Comments/ViewTest.php   |  59 +++++
 .../Sales/Order/Create/Sidebar/CartTest.php   |  59 +++++
 .../Order/Creditmemo/Create/ItemsTest.php     |  99 ++++++++
 .../Sales/Order/Invoice/Create/Tracking.php   |  58 +++++
 .../Block/Sales/View/HistoryTest.php          |  60 +++++
 .../Adminhtml/Block/System/Cache/EditTest.php |  58 +++++
 .../Block/System/Config/EditTest.php          |  58 +++++
 .../Block/System/Config/TabsTest.php          | 153 +++++++++++++
 .../Adminhtml/Block/System/CurrencyTest.php   |  97 ++++++++
 .../Block/System/Design/EditTest.php          |  98 ++++++++
 .../Adminhtml/Block/System/DesignTest.php     |  58 +++++
 .../Block/System/Email/Template/EditTest.php  | 215 ++++++++++++++++++
 .../Block/System/Email/TemplateTest.php       |  58 +++++
 .../Block/System/Store/Delete/GroupTest.php   |  96 ++++++++
 .../Block/System/Store/Delete/WebsiteTest.php |  96 ++++++++
 .../Block/Tax/Rate/Toolbar/AddTest.php        |  58 +++++
 .../Block/Tax/Rate/Toolbar/SaveTest.php       | 115 ++++++++++
 .../Mage/Adminhtml/Block/TemplateTest.php     |   1 -
 .../Adminhtml/Block/Urlrewrite/EditTest.php   |  69 ++++++
 .../Block/Widget/Form/Element/GalleryTest.php |  77 +++++++
 .../Mage/Adminhtml/Block/Widget/GridTest.php  |  72 +++++-
 .../Block/Adminhtml/Attribute/ButtonsTest.php |  76 +++++++
 .../Block/Adminhtml/Roles/ButtonsTest.php     | 115 ++++++++++
 .../Catalog/Product/Edit/Tab/BundleTest.php   |  58 +++++
 .../Product/Edit/Tab/Option/OptionTest.php    |  95 ++++++++
 .../Edit/Tab/Downloadable/LinksTest.php       |  58 +++++
 .../Edit/Tab/Downloadable/SamplesTest.php     |  59 +++++
 .../Sales/Block/Invoice/Create/ItemsTest.php  |  81 +++++++
 .../Sales/Block/Order/Create/SidebarTest.php  |  60 +++++
 .../Block/Order/Shipment/Create/ItemsTest.php |  58 +++++
 .../Order/Shipment/Create/TrackingTest.php    |  58 +++++
 .../Order/Shipment/View/TrackingTest.php      |  61 +++++
 .../Mage/Sales/Block/View/GiftmessageTest.php |  58 +++++
 .../unit/Mage/Uploader/Block/AbstractTest.php |  41 ++++
 .../unit/Mage/Uploader/Block/MultipleTest.php |  58 +++++
 142 files changed, 6804 insertions(+), 1556 deletions(-)
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Api/ButtonsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Category/TreeTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormattributeTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormgroupTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/MainTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/MainTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/_New/Product/CreatedTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/CreatedTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Actions/AttributeTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Bundle/Option/SelectionTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/OptionsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/GroupTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/TierTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/SettingsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Catalog/Product/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Newsletter/ProblemTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Permissions/ButtonsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Report/GridTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Sales/Order/Comments/ViewTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/CartTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Sales/View/HistoryTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Cache/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Config/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Config/TabsTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/CurrencyTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Design/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/DesignTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Email/Template/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Email/TemplateTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Store/Delete/GroupTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Store/Delete/WebsiteTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Widget/Form/Element/GalleryTest.php
 create mode 100644 tests/unit/Mage/Api2/Block/Adminhtml/Attribute/ButtonsTest.php
 create mode 100644 tests/unit/Mage/Api2/Block/Adminhtml/Roles/ButtonsTest.php
 create mode 100644 tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/BundleTest.php
 create mode 100644 tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/Option/OptionTest.php
 create mode 100644 tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
 create mode 100644 tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/Invoice/Create/ItemsTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/Order/Create/SidebarTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/Order/Shipment/Create/ItemsTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/Order/Shipment/Create/TrackingTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/Order/Shipment/View/TrackingTest.php
 create mode 100644 tests/unit/Mage/Sales/Block/View/GiftmessageTest.php
 create mode 100644 tests/unit/Mage/Uploader/Block/MultipleTest.php

diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
index 059ea58fe03..3ab017e9d72 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
@@ -20,80 +20,79 @@
  */
 class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('api/userinfo.phtml');
-    }
+    public const BUTTON_BACK    = 'backButton';
+    public const BUTTON_DELETE  = 'deleteButton';
+    public const BUTTON_RESET   = 'resetButton';
+    public const BUTTON_SAVE    = 'saveButton';
+
+    protected $_template = 'api/userinfo.phtml';
 
+    /**
+     * @codeCoverageIgnore
+     * @inheritDoc
+     */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'backButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Back'),
-                    'onclick'   => 'window.location.href=\'' . $this->getUrl('*/*/') . '\'',
-                    'class' => 'back'
-                ])
-        );
-
-        $this->setChild(
-            'resetButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Reset'),
-                    'onclick'   => 'window.location.reload()'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'saveButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Save Role'),
-                    'onclick'   => 'roleForm.submit();return false;',
-                    'class' => 'save'
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'deleteButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Delete Role'),
-                    'onclick'   => 'if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
-                        Mage::helper('adminhtml')->__('Are you sure you want to do this?')
-                    ) . '\')) roleForm.submit(\'' . $this->getUrl('*/*/delete') . '\'); return false;',
-                    'class' => 'delete'
-                ])
-        );
-        return parent::_prepareLayout();
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick('window.location.href=\'' . $this->getUrl('*/*/') . '\'');
     }
 
-    public function getBackButtonHtml()
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('backButton');
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
+            ->setOnClick(
+                'if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
+                    Mage::helper('adminhtml')->__('Are you sure you want to do this?')
+                ) . '\')) roleForm.submit(\'' . $this->getUrl('*/*/delete') . '\'); return false;'
+            );
     }
 
-    public function getResetButtonHtml()
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('resetButton');
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.reload()')
+            ->resetClass();
     }
 
-    public function getSaveButtonHtml()
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('saveButton');
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
+            ->setOnClick('roleForm.submit();return false;');
     }
 
+    /**
+     * @inheritDoc
+     */
     public function getDeleteButtonHtml()
     {
         if ((int) $this->getRequest()->getParam('rid') == 0) {
-            return;
+            return '';
         }
-        return $this->getChildHtml('deleteButton');
+        return parent::getDeleteButtonHtml();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     public function getUser()
     {
         return Mage::registry('user_data');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
index 5a7a8c05476..f978fdbf816 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -48,46 +48,48 @@ protected function _prepareLayout()
 
         // Save button
         if (!$category->isReadonly()) {
-            $this->setChild(
-                'save_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Save Category'),
-                        'onclick'   => "categorySubmit('" . $this->getSaveUrl() . "', true)",
-                        'class' => 'save'
-                    ])
-            );
+            $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
         }
 
         // Delete button
         if (!in_array($categoryId, $this->getRootIds()) && $category->isDeleteable()) {
-            $this->setChild(
-                'delete_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Delete Category'),
-                        'onclick'   => "categoryDelete('" . $this->getUrl('*/*/delete', ['_current' => true]) . "', true, {$categoryId})",
-                        'class' => 'delete'
-                    ])
-            );
+            $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
         }
 
         // Reset button
         if (!$category->isReadonly()) {
-            $resetPath = $categoryId ? '*/*/edit' : '*/*/add';
-            $this->setChild(
-                'reset_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Reset'),
-                        'onclick'   => "categoryReset('" . $this->getUrl($resetPath, ['_current' => true]) . "',true)"
-                    ])
-            );
+            $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
         }
 
         return parent::_prepareLayout();
     }
 
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Delete Category'))
+            ->setOnClick("categorySubmit('" . $this->getSaveUrl() . "', true)");
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $category   = $this->getCategory();
+        $categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
+        $resetPath  = $categoryId ? '*/*/edit' : '*/*/add';
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick("categoryReset('" . $this->getUrl($resetPath, ['_current' => true]) . "',true)")
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $category   = $this->getCategory();
+        $categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Save Category'))
+            ->setOnClick("categoryDelete('" . $this->getUrl('*/*/delete', ['_current' => true]) . "', true, {$categoryId})");
+    }
+
     public function getStoreConfigurationUrl()
     {
         $storeId = (int) $this->getRequest()->getParam('store');
@@ -145,7 +147,7 @@ public function addAdditionalButton($alias, $config)
         }
         $this->setChild(
             $alias . '_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->addData($config)
+            parent::getButtonBlock()->addData($config)
         );
         $this->_additionalButtons[$alias] = $alias . '_button';
         return $this;
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
index 5f81ba6cdef..5994826ec78 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
@@ -49,7 +49,11 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
         if (Mage::getSingleton('cms/wysiwyg_config')->isEnabled()) {
-            $this->getLayout()->getBlock('head')->setCanLoadTinyMce(true);
+            /** @var Mage_Page_Block_Html_Head $head */
+            $head = $this->getLayout()->getBlock('head');
+            if ($head) {
+                $head->setCanLoadTinyMce(true);
+            }
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
index 6f70c43dd35..79ac96a8aa4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -40,35 +40,10 @@ public function __construct()
 
     protected function _prepareLayout()
     {
-        $addUrl = $this->getUrl('*/*/add', [
-            '_current' => true,
-            'id' => null,
-            '_query' => false
-        ]);
-
-        $this->setChild(
-            self::BUTTON_ADD_SUB,
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Add Subcategory'),
-                    'onclick'   => "addNew('" . $addUrl . "', false)",
-                    'class'     => 'add',
-                    'id'        => 'add_subcategory_button',
-                    'style'     => $this->canAddSubCategory() ? '' : 'display: none;'
-                ])
-        );
+        $this->setChild(self::BUTTON_ADD_SUB, $this->getButtonAddSubBlock());
 
         if ($this->canAddRootCategory()) {
-            $this->setChild(
-                self::BUTTON_ADD_ROOT,
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Add Root Category'),
-                        'onclick'   => "addNew('" . $addUrl . "', true)",
-                        'class'     => 'add',
-                        'id'        => 'add_root_category_button'
-                    ])
-            );
+            $this->setChild(self::BUTTON_ADD_ROOT, $this->getButtonAddRootBlock());
         }
 
         $this->setChild(
@@ -80,6 +55,23 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
+    public function getButtonAddRootBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setId('add_root_category_button')
+            ->setLabel(Mage::helper('catalog')->__('Add Root Category'))
+            ->setOnClick("addNew('" . $this->getAddUrl() . "', true)");
+    }
+
+    public function getButtonAddSubBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setId('add_subcategory_button')
+            ->setLabel(Mage::helper('catalog')->__('Add Subcategory'))
+            ->setOnClick("addNew('" . $this->getAddUrl() . "', false)")
+            ->setStyle($this->canAddSubCategory() ? '' : 'display: none;');
+    }
+
     protected function _getDefaultStoreId()
     {
         return Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID;
@@ -139,6 +131,15 @@ public function getLoadTreeUrl($expanded = null)
         return $this->getUrl('*/*/categoriesJson', $params);
     }
 
+    public function getAddUrl($expanded = null)
+    {
+        return $this->getUrl('*/*/add', [
+            '_current' => true,
+            'id' => null,
+            '_query' => false
+        ]);
+    }
+
     public function getNodesUrl()
     {
         return $this->getUrl('*/catalog_category/jsonTree');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
index 9896c106e98..7c17fb7efaa 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
@@ -38,17 +38,24 @@ protected function _prepareLayout()
                 ->setGroupAttributes($this->_getGroupAttributes())
         );
 
-        $this->setChild(
-            'close_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'   => Mage::helper('catalog')->__('Close Window'),
-                    'onclick' => 'addAttribute(true)'
-                ])
-        );
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_CLOSE, $this->getButtonCloseBlock());
+    }
+
+    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonCloseBlock($name, $attributes)
+            ->setOnClick('addAttribute(true)');
+    }
+
     /**
      * @return array
      * @throws Exception
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
index de7852901bb..9a238ea29fd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
@@ -38,8 +38,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main extends Mage_Admin
      */
     protected function _prepareLayout()
     {
-        $setId = $this->_getSetId();
-
         $this->setChild(
             self::BLOCK_GROUP_TREE,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_tree_group')
@@ -50,71 +48,73 @@ protected function _prepareLayout()
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_formset')
         );
 
-        $this->setChild(
-            'delete_group_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Delete Selected Group'),
-                'onclick'   => 'editSet.submit();',
-                'class'     => 'delete'
-            ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'add_group_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Add New'),
-                'onclick'   => 'editSet.addGroup();',
-                'class'     => 'add'
-            ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE_GROUP, $this->getButtonDeleteGroupBlock());
+        $this->setChild(self::BUTTON_ADD_GROUP, $this->getButtonAddGroupBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_RENAME, $this->getButtonRenameBlock());
+    }
 
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Back'),
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/')),
-                'class'     => 'back'
-            ])
-        );
+    public function getButtonAddGroupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add New'))
+            ->setOnClick('editSet.addGroup();');
+    }
 
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Reset'),
-                'onclick'   => 'window.location.reload()'
-            ])
-        );
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl();
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Save Attribute Set'),
-                'onclick'   => 'editSet.save();',
-                'class'     => 'save'
-            ])
-        );
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Delete Attribute Set'))
+            ->setOnClick(Mage::helper('core/js')->getDeleteConfirmJs(
+                $this->getUrlSecure('*/*/delete', ['id' => $this->_getSetId()]),
+                Mage::helper('catalog')->__('All products of this set will be deleted! Are you sure you want to delete this attribute set?')
+            ));
+    }
 
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('Delete Attribute Set'),
-                'onclick'   => Mage::helper('core/js')->getDeleteConfirmJs(
-                    $this->getUrlSecure('*/*/delete', ['id' => $setId]),
-                    Mage::helper('catalog')->__('All products of this set will be deleted! Are you sure you want to delete this attribute set?')
-                ),
-                'class'     => 'delete'
-            ])
-        );
+    public function getButtonDeleteGroupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Delete Selected Group'))
+            ->setOnClick('editSet.submit();');
+    }
 
-        $this->setChild(
-            'rename_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('catalog')->__('New Set Name'),
-                'onclick'   => 'editSet.rename()'
-            ])
-        );
+    public function getButtonRenameBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('New Set Name'))
+            ->setOnClick('editSet.rename()');
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.reload()')
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Save Attribute Set'))
+            ->setOnClick('editSet.save();');
     }
 
     /**
@@ -291,7 +291,7 @@ public function getDeleteButtonHtml()
         if ($this->getIsCurrentSetDefault()) {
             return '';
         }
-        return $this->getChildHtml('delete_button');
+        return parent::getDeleteButtonHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
index 5c5e79ee53d..33afc18885b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
@@ -40,13 +40,7 @@ protected function _prepareForm()
             'submit',
             'note',
             [
-                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Add Attribute'),
-                        'onclick'   => 'this.form.submit();',
-                        'class'     => 'add'
-                    ])
-                    ->toHtml(),
+                'text' => $this->getButtonAddBlock()->toHtml(),
             ]
         );
 
@@ -55,4 +49,11 @@ protected function _prepareForm()
         $this->setForm($form);
         return $this;
     }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add Attribute'))
+            ->setOnClick('this.form.submit();');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
index 013be190690..67354e41dff 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
@@ -40,13 +40,7 @@ protected function _prepareForm()
             'submit',
             'note',
             [
-                'text' => $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Add Group'),
-                    'onclick'   => 'this.form.submit();',
-                    'class'     => 'add'
-                ])
-                ->toHtml(),
+                'text' => $this->getButtonAddBlock()->toHtml(),
             ]
         );
 
@@ -66,6 +60,13 @@ protected function _prepareForm()
         return $this;
     }
 
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add Group'))
+            ->setOnClick('this.form.submit();');
+    }
+
     protected function _getSetId()
     {
         return ((int) $this->getRequest()->getParam('id') > 0)
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
index 1a48f380620..5412c9a795b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
@@ -29,32 +29,38 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add extends Mag
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Save Attribute Set'),
-                    'onclick'   => 'if (addSet.submit()) disableElements(\'save\');',
-                    'class' => 'save'
-            ])
-        );
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Back'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/')),
-                    'class' => 'back'
-            ])
-        );
-
         $this->setChild(
             self::BLOCK_FORM,
             $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main_formset')
         );
+
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveGroupBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+    }
+
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsFullUrl($this->getUrl('*/*/'));
+    }
+
+    public function getButtonSaveGroupBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock()
+            ->setLabel(Mage::helper('catalog')->__('Save Attribute Set'))
+            ->setOnClick('if (addSet.submit()) disableElements(\'save\');')
+            ->resetClass();
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
index e400c5909d9..2f4137cfda9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
@@ -32,18 +32,25 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main extends Ma
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'addButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Add New Set'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/add')),
-                    'class'     => 'add',
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add New Set'))
+            ->setOnClickSetLocationJsUrl('*/*/add');
+    }
+
     /**
      * @return string
      * @deprecated
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
index 78bc6ebab00..e9e02cf2e62 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
@@ -33,20 +33,22 @@ class Mage_Adminhtml_Block_Catalog_Product_Created extends Mage_Adminhtml_Block_
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'close_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'   => Mage::helper('catalog')->__('Close Window'),
-                    'onclick' => 'addProduct(true)'
-                ])
-        );
-        return $this;
+        $this->addButtons();
+        return parent::_prepareLayout();
     }
 
-    public function getCloseButtonHtml()
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_CLOSE, $this->getButtonCloseBlock());
+    }
+
+    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('close_button');
+        return parent::getButtonCloseBlock($name, $attributes)
+            ->setOnClick('addProduct(true)');
     }
 
     public function getProductId()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
index bee32088e5c..1835a3c1755 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -42,88 +42,79 @@ public function getProduct()
     protected function _prepareLayout()
     {
         if (!$this->getRequest()->getParam('popup')) {
-            $this->setChild(
-                'back_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Back'),
-                        'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/', ['store' => $this->getRequest()->getParam('store', 0)])),
-                        'class'     => 'back'
-                    ])
-            );
+            $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
         } else {
-            $this->setChild(
-                'back_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Close Window'),
-                        'onclick'   => 'window.close()',
-                        'class'     => 'cancel'
-                    ])
-            );
+            $this->setChild(self::BUTTON_BACK, $this->getButtonBackPopupBlock());
         }
 
         if (!$this->getProduct()->isReadonly()) {
-            $this->setChild(
-                'reset_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Reset'),
-                        'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/*', ['_current' => true]))
-                    ])
-            );
-
-            $this->setChild(
-                'save_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Save'),
-                        'onclick'   => 'productForm.submit()',
-                        'class'     => 'save'
-                    ])
-            );
+            $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+            $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
         }
 
         if (!$this->getRequest()->getParam('popup')) {
             if (!$this->getProduct()->isReadonly()) {
-                $this->setChild(
-                    'save_and_edit_button',
-                    $this->getLayout()->createBlock('adminhtml/widget_button')
-                        ->setData([
-                            'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
-                            'onclick'   => Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()),
-                            'class'     => 'save'
-                        ])
-                );
+                $this->setChild(self::BUTTON_SAVE_AND_CONTINUE, $this->getButtonSaveAndContinueBlock());
             }
             if ($this->getProduct()->isDeleteable()) {
-                $this->setChild(
-                    'delete_button',
-                    $this->getLayout()->createBlock('adminhtml/widget_button')
-                        ->setData([
-                            'label'     => Mage::helper('catalog')->__('Delete'),
-                            'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()),
-                            'class'     => 'delete'
-                        ])
-                );
+                $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
             }
 
             if ($this->getProduct()->isDuplicable()) {
-                $this->setChild(
-                    'duplicate_button',
-                    $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'     => Mage::helper('catalog')->__('Duplicate'),
-                        'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getDuplicateUrl()),
-                        'class'     => 'add'
-                    ])
-                );
+                $this->setChild(self::BUTTON_DUPLICATE, $this->getButtonDuplicateBlock());
             }
         }
 
         return parent::_prepareLayout();
     }
 
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/*/', [
+                'store' => $this->getRequest()->getParam('store', 0),
+            ]);
+    }
+
+
+    public function getButtonBackPopupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackPopupBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Close Window'));
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()));
+    }
+
+    public function getButtonDuplicateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDuplicateBlock($name, $attributes)
+            ->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDuplicateUrl()))
+            ->setClass(self::BUTTON__CLASS_ADD);
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick(Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/*', ['_current' => true])))
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setOnClick('productForm.submit()');
+    }
+
+    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveAndContinueBlock($name, $attributes)
+            ->setOnClick(Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()));
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
index 761488cf170..3b4fa67c22d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
@@ -28,40 +28,38 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute extends Mage_Ad
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Back'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs(
-                        $this->getUrl(
-                            '*/catalog_product/',
-                            ['store' => $this->getRequest()->getParam('store', 0)]
-                        )
-                    ),
-                    'class' => 'back'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Reset'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/*', ['_current' => true]))
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Save'),
-                    'onclick'   => 'attributesForm.submit()',
-                    'class'     => 'save'
-                ])
-        );
-        return $this;
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/catalog_product/', [
+                'store' => $this->getRequest()->getParam('store', 0)
+            ]);
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setOnClick('attributesForm.submit()');
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
index d05820504c5..e5b55b753c0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
@@ -30,22 +30,28 @@ protected function _prepareLayout()
     {
         $this->setChild(
             self::BLOCK_OPTION_BOX,
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Add New Option'),
-                    'class' => 'add',
-                    'id'    => 'add_new_defined_option'
-                ])
-        );
-
-        $this->setChild(
-            'options_box',
             $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_options_option')
         );
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setId('add_new_defined_option')
+            ->setLabel(Mage::helper('catalog')->__('Add New Option'));
+    }
+
     public function getOptionsBoxHtml()
     {
         return $this->getChildHtml(self::BLOCK_OPTION_BOX);
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
index 2b1b9b31972..110ae1c22e3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
@@ -109,15 +109,6 @@ public function isReadonly()
 
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Delete Option'),
-                    'class' => 'delete delete-product-option '
-                ])
-        );
-
         $path = 'global/catalog/product/options/custom/groups';
         foreach (Mage::getConfig()->getNode($path)->children() as $group) {
             $this->setChild(
@@ -128,9 +119,25 @@ protected function _prepareLayout()
             );
         }
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Delete Option'))
+            ->addClass('delete-product-option');
+    }
+
     public function getAddButtonId()
     {
         return $this->getLayout()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
index 0ed5e1129e8..a234f3eb38a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
@@ -43,27 +43,33 @@ public function __construct()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'add_select_row_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Add New Row'),
-                    'class' => 'add add-select-row',
-                    'id'    => 'add_select_row_button_{{option_id}}'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'delete_select_row_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Delete Row'),
-                    'class' => 'delete delete-select-row icon-btn',
-                    'id'    => 'delete_select_row_button'
-                ])
-        );
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setId('add_select_row_button_{{option_id}}')
+            ->setLabel(Mage::helper('catalog')->__('Add New Row'))
+            ->addClass('add-select-row');
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setId('delete_select_row_button')
+            ->setLabel(Mage::helper('catalog')->__('Delete Row'))
+            ->addClass('delete-select-row icon-btn');
     }
 
     public function getPriceTypeSelectHtml()
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
index 4c3ff9f863a..18d42fd6d4a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
@@ -60,18 +60,26 @@ protected function _sortGroupPrices($a, $b)
      */
     protected function _prepareLayout()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label' => Mage::helper('catalog')->__('Add Group Price'),
-                'onclick' => 'return groupPriceControl.addItem()',
-                'class' => 'add'
-            ]);
-        $button->setName('add_group_price_item_button');
-
-        $this->setChild('add_button', $button);
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add Group Price'))
+            ->setOnClick('return groupPriceControl.addItem()')
+            ->setName('add_group_price_item_button');
+    }
+
     /**
      *  Get is percent flag
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
index 0e51b69a414..d73ae874211 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
@@ -77,15 +77,23 @@ protected function _sortTierPrices($a, $b)
      */
     protected function _prepareLayout()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label' => Mage::helper('catalog')->__('Add Tier'),
-                'onclick' => 'return tierPriceControl.addItem()',
-                'class' => 'add'
-            ]);
-        $button->setName('add_tier_price_item_button');
-
-        $this->setChild('add_button', $button);
+        $this->addButtons();
         return parent::_prepareLayout();
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add Tier'))
+            ->setOnClick('return tierPriceControl.addItem()')
+            ->setName('add_tier_price_item_button');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
index 19efa6a465d..fb5d7423d03 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
@@ -30,18 +30,25 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings extends Mage_Adminh
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'continue_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Continue'),
-                    'onclick'   => "setSettings('" . $this->getContinueUrl() . "','attribute_set_id','product_type')",
-                    'class'     => 'save'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_CONTINUE, $this->getButtonContinueBlock());
+    }
+
+    public function getButtonContinueBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock()
+            ->setLabel(Mage::helper('catalog')->__('Continue'))
+            ->setOnClick("setSettings('" . $this->getContinueUrl() . "','attribute_set_id','product_type')");
+    }
+
     protected function _prepareForm()
     {
         $form = new Varien_Data_Form();
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
index 3b23b2f3ecd..a3128e7c85a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
@@ -22,6 +22,9 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config extends Mage_Adminhtml_Block_Widget implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
+    public const BLOCK_GRID                 = 'grid';
+    public const BLOCK_SIMPLE               = 'simple';
+
     public const BUTTON_CREATE_EMPTY        = 'create_empty';
     public const BUTTON_CREATE_CONFIGURABLE = 'create_from_configurable';
 
@@ -85,46 +88,44 @@ public function isAttributesPricesReadonly()
     protected function _prepareLayout()
     {
         $this->setChild(
-            'grid',
+            self::BLOCK_GRID,
             $this->getLayout()->createBlock(
                 'adminhtml/catalog_product_edit_tab_super_config_grid',
                 'admin.product.edit.tab.super.config.grid'
             )
         );
 
-        $this->setChild(
-            'create_empty',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Create Empty'),
-                    'class' => 'add',
-                    'onclick' => 'superProduct.createEmptyProduct()'
-                ])
-        );
+        $this->setChild(self::BUTTON_CREATE_EMPTY, $this->getButtonCreateEmptyBlock());
 
         if ($this->_getProduct()->getId()) {
             $this->setChild(
-                'simple',
+                self::BLOCK_SIMPLE,
                 $this->getLayout()->createBlock(
                     'adminhtml/catalog_product_edit_tab_super_config_simple',
                     'catalog.product.edit.tab.super.config.simple'
                 )
             );
 
-            $this->setChild(
-                'create_from_configurable',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label' => Mage::helper('catalog')->__('Copy From Configurable'),
-                        'class' => 'add',
-                        'onclick' => 'superProduct.createNewProduct()'
-                    ])
-            );
+            $this->setChild(self::BUTTON_CREATE_CONFIGURABLE, $this->getButtonCreateFromConfigurableBlock());
         }
 
         return parent::_prepareLayout();
     }
 
+    public function getButtonCreateEmptyBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('catalog')->__('Create Empty'))
+            ->setOnClick('superProduct.createEmptyProduct()');
+    }
+
+    public function getButtonCreateFromConfigurableBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('catalog')->__('Copy From Configurable'))
+            ->setOnClick('superProduct.createNewProduct()');
+    }
+
     /**
      * Retrieve currently edited product object
      *
@@ -218,7 +219,7 @@ public function getConfigurableSettings($product)
      */
     public function getGridHtml()
     {
-        return $this->getChildHtml('grid');
+        return $this->getChildHtml(self::BLOCK_GRID);
     }
 
     /**
@@ -228,7 +229,7 @@ public function getGridHtml()
      */
     public function getGridJsObject()
     {
-        return $this->getChild('grid')->getJsObjectName();
+        return $this->getChild(self::BLOCK_GRID)->getJsObjectName();
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
index 1d1aa214acd..7e629bb9ad4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
@@ -30,28 +30,33 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings extends Mage_
      */
     protected function _prepareLayout()
     {
-        $onclick = "setSuperSettings('" . $this->getContinueUrl() . "','attribute-checkbox', 'attributes')";
-        $this->setChild(
-            'continue_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Continue'),
-                    'onclick'   => $onclick,
-                    'class'     => 'save'
-                ])
-        );
-
-        $backButton = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label'     => Mage::helper('catalog')->__('Back'),
-                'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getBackUrl()),
-                'class'     => 'back'
-            ]);
-
-        $this->setChild('back_button', $backButton);
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_CONTINUE, $this->getButtonContinueBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+    }
+
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsFullUrl($this->getBackUrl());
+    }
+
+    public function getButtonContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $onclick = "setSuperSettings('" . $this->getContinueUrl() . "','attribute-checkbox', 'attributes')";
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Continue'))
+            ->setOnClick($onclick);
+    }
+
     /**
      * Retrieve currently edited product object
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index 6996c4b6d11..7206dd9637a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -40,46 +40,54 @@ public function getRegionsUrl()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'  => Mage::helper('customer')->__('Delete Address'),
-                    'name'   => 'delete_address',
-                    'element_name' => 'delete_address',
-                    'disabled' => $this->isReadonly(),
-                    'class'  => 'delete' . ($this->isReadonly() ? ' disabled' : '')
-                ])
-        );
-        $this->setChild(
-            'add_address_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'  => Mage::helper('customer')->__('Add New Address'),
-                    'id'     => 'add_address_button',
-                    'name'   => 'add_address_button',
-                    'element_name' => 'add_address_button',
-                    'disabled' => $this->isReadonly(),
-                    'class'  => 'add' . ($this->isReadonly() ? ' disabled' : ''),
-                    'onclick' => 'customerAddresses.addNewAddress()'
-                ])
-        );
-        $this->setChild(
-            'cancel_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'  => Mage::helper('customer')->__('Cancel'),
-                    'id'     => 'cancel_add_address' . $this->getTemplatePrefix(),
-                    'name'   => 'cancel_address',
-                    'element_name' => 'cancel_address',
-                    'class'  => 'cancel delete-address' . ($this->isReadonly() ? ' disabled' : ''),
-                    'disabled' => $this->isReadonly(),
-                    'onclick' => 'customerAddresses.cancelAdd(this)',
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+        $this->setChild(self::BUTTON_CANCEL, $this->getButtonCancelBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setId('add_address_button')
+            ->setLabel(Mage::helper('customer')->__('Add New Address'))
+            ->setOnClick('customerAddresses.addNewAddress()')
+            ->addClass($this->isReadonly() ? ' disabled' : '')
+            ->setDisabled($this->isReadonly())
+            ->setElementName('add_address_button')
+            ->setName('add_address_button');
+    }
+
+    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonCancelBlock($name, $attributes)
+            ->setId('cancel_add_address' . $this->getTemplatePrefix())
+            ->setLabel(Mage::helper('customer')->__('Cancel'))
+            ->setOnClick('customerAddresses.cancelAdd(this)')
+            ->addClass('delete-address' . ($this->isReadonly() ? ' disabled' : ''))
+            ->setDisabled($this->isReadonly())
+            ->setElementName('cancel_address')
+            ->setName('cancel_address');
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('customer')->__('Delete Address'))
+            ->addClass($this->isReadonly() ? ' disabled' : '')
+            ->setDisabled($this->isReadonly())
+            ->setElementName('delete_address')
+            ->setName('delete_address');
+    }
+
     /**
      * Check block is readonly.
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
index d19f20f5448..f9479ea811e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
@@ -69,14 +69,10 @@ public function getValidateButton()
             $optionsVarName = $this->getJsVariablePrefix() . 'VatParameters';
             $beforeHtml = '<script type="text/javascript">var ' . $optionsVarName . ' = ' . $vatValidateOptions
                 . ';</script>';
-
-            /** @var Mage_Adminhtml_Block_Widget_Button $block */
-            $block = $this->getLayout()->createBlock('adminhtml/widget_button');
-            $this->_validateButton = $block->setData([
-                'label'       => Mage::helper('customer')->__('Validate VAT Number'),
-                'before_html' => $beforeHtml,
-                'onclick'     => 'order.validateVat(' . $optionsVarName . ')'
-            ]);
+            $this->_validateButton = parent::getButtonBlock()
+                ->setLabel(Mage::helper('customer')->__('Validate VAT Number'))
+                ->setOnClick('order.validateVat(' . $optionsVarName . ')')
+                ->setBeforeHtml($beforeHtml);
         }
         return $this->_validateButton;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
index 8229bf331d8..6f7bb834b34 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
@@ -45,30 +45,33 @@ protected function _prepareLayout()
             $this->getLayout()->createBlock('adminhtml/newsletter_problem_grid', 'newsletter.problem.grid')
         );
 
-        $this->setChild(
-            'deleteButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button', 'del.button')
-                ->setData(
-                    [
-                        'label' => Mage::helper('newsletter')->__('Delete Selected Problems'),
-                        'onclick' => 'problemController.deleteSelected();'
-                    ]
-                )
-        );
-
-        $this->setChild(
-            'unsubscribeButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button', 'unsubscribe.button')
-                ->setData(
-                    [
-                        'label' => Mage::helper('newsletter')->__('Unsubscribe Selected'),
-                        'onclick' => 'problemController.unsubscribe();'
-                    ]
-                )
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_UNSUBSCRIBE, $this->getButtonUnsubscribeBlock());
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock('del.button')
+            ->setLabel(Mage::helper('newsletter')->__('Delete Selected Problems'))
+            ->setOnClick('problemController.deleteSelected();');
+    }
+
+    public function getButtonUnsubscribeBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock('unsubscribe.button')
+            ->setLabel(Mage::helper('newsletter')->__('Unsubscribe Selected'))
+            ->setOnClick('problemController.unsubscribe();');
+    }
+
     public function getUnsubscribeButtonHtml()
     {
         return $this->getChildHtml(self::BUTTON_UNSUBSCRIBE);
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
index c90ce04032c..bce04237fb8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -83,63 +83,62 @@ protected function _prepareLayout()
     {
         // Load Wysiwyg on demand and Prepare layout
         if (Mage::getSingleton('cms/wysiwyg_config')->isEnabled()) {
-            $this->getLayout()->getBlock('head')->setCanLoadTinyMce(true);
+            /** @var Mage_Page_Block_Html_Head $head */
+            $head = $this->getLayout()->getBlock('head');
+            if ($head) {
+                $head->setCanLoadTinyMce(true);
+            }
         }
 
-        $this->setChild(
-            'preview_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Preview Template'),
-                    'onclick'   => 'queueControl.preview();',
-                    'class'     => 'task'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Save Newsletter'),
-                    'onclick'   => 'queueControl.save()',
-                    'class'     => 'save'
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_PREVIEW, $this->getButtonPreviewBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_SAVE_AND_CONTINUE, $this->getButtonSaveAndContinueBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+    }
 
-        $this->setChild(
-            'save_and_resume',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Save and Resume'),
-                    'onclick'   => 'queueControl.resume()',
-                    'class'     => 'save'
-                ])
-        );
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $route = $this->getTemplateId() ? '*/newsletter_template/' : '*/*';
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick("window.location.href = '" . $this->getUrl($route) . "'");
+    }
 
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Reset'),
-                    'onclick'   => 'window.location = window.location'
-                ])
-        );
+    public function getButtonPreviewBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Preview Template'))
+            ->setOnClick('queueControl.preview();')
+            ->setClass(self::BUTTON__CLASS_TASK);
+    }
 
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('newsletter')->__('Back'),
-                        'onclick' => "window.location.href = '" . $this->getUrl((
-                            $this->getTemplateId() ? '*/newsletter_template/' : '*/*'
-                        )) . "'",
-                        'class'   => 'back'
-                    ]
-                )
-        );
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location = window.location');
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Save Newsletter'))
+            ->setOnClick('queueControl.save()');
+    }
+
+    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveAndContinueBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Save and Resume'))
+            ->setOnClick('queueControl.resume()');
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
index 7fcd0285cb3..0109d9957e2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
@@ -56,89 +56,84 @@ protected function _prepareLayout()
             $block->setCanLoadTinyMce(true);
         }
 
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Back'),
-                    'onclick'   => "window.location.href = '" . $this->getUrl('*/*') . "'",
-                    'class'     => 'back'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Reset'),
-                    'onclick'   => 'window.location.href = window.location.href'
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_TO_PLAIN, $this->getButtonToPlainBlock());
+        $this->setChild(self::BUTTON_TO_HTML, $this->getButtonToHtmlBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_SAVE_AS, $this->getButtonSaveAsBlock());
+        $this->setChild(self::BUTTON_PREVIEW, $this->getButtonPreviewBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'to_plain_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Convert to Plain Text'),
-                    'onclick'   => 'templateControl.stripTags();',
-                    'id'        => 'convert_button',
-                    'class'     => 'task'
-                ])
-        );
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick("window.location.href = '" . $this->getUrl('*/*') . "'");
+    }
 
-        $this->setChild(
-            'to_html_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Return HTML Version'),
-                    'onclick'   => 'templateControl.unStripTags();',
-                    'id'        => 'convert_button_back',
-                    'style'     => 'display:none',
-                    'class'     => 'task'
-                ])
-        );
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Delete Template'))
+            ->setOnClick('templateControl.deleteTemplate();');
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Save Template'),
-                    'onclick'   => 'templateControl.save();',
-                    'class'     => 'save'
-                ])
-        );
+    public function getButtonPreviewBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Preview Template'))
+            ->setOnClick('templateControl.preview();')
+            ->setClass(self::BUTTON__CLASS_TASK);
+    }
 
-        $this->setChild(
-            'save_as_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Save As'),
-                    'onclick'   => 'templateControl.saveAs();',
-                    'class'     => 'save'
-                ])
-        );
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.href = window.location.href')
+            ->resetClass();
+    }
 
-        $this->setChild(
-            'preview_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Preview Template'),
-                    'onclick'   => 'templateControl.preview();',
-                    'class'     => 'task'
-                ])
-        );
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Save Template'))
+            ->setOnClick('templateControl.save();');
+    }
 
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('newsletter')->__('Delete Template'),
-                    'onclick'   => 'templateControl.deleteTemplate();',
-                    'class'     => 'delete'
-                ])
-        );
+    public function getButtonSaveAsBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('newsletter')->__('Save As'))
+            ->setOnClick('templateControl.saveAs();');
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonToHtmlBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setId('convert_button_back')
+            ->setLabel(Mage::helper('newsletter')->__('Return HTML Version'))
+            ->setOnClick('templateControl.unStripTags();')
+            ->setClass(self::BUTTON__CLASS_TASK)
+            ->setStyle('display:none');
+    }
+
+    public function getButtonToPlainBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setId('convert_button')
+            ->setLabel(Mage::helper('newsletter')->__('Convert to Plain Text'))
+            ->setOnClick('templateControl.stripTags();')
+            ->setClass(self::BUTTON__CLASS_TASK);
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
index e3bf9746373..5ed2c3b6872 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
@@ -33,47 +33,48 @@ class Mage_Adminhtml_Block_Permissions_Buttons extends Mage_Adminhtml_Block_Temp
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'backButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Back'),
-                    'onclick'   => 'window.location.href=\'' . $this->getUrl('*/*/') . '\'',
-                    'class' => 'back'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'resetButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Reset'),
-                    'onclick'   => 'window.location.reload()'
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'saveButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Save Role'),
-                    'onclick'   => 'roleForm.submit();return false;',
-                    'class' => 'save'
-                ])
-        );
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick('window.location.href=\'' . $this->getUrl('*/*/') . '\'');
+    }
 
-        $this->setChild(
-            'deleteButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Delete Role'),
-                    'onclick'   => 'if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
-                        Mage::helper('adminhtml')->__('Are you sure you want to do this?')
-                    ) . '\')) roleForm.submit(\'' . $this->getUrl('*/*/delete') . '\'); return false;',
-                    'class' => 'delete'
-                ])
-        );
-        return parent::_prepareLayout();
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
+            ->setOnClick('if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
+                Mage::helper('adminhtml')->__('Are you sure you want to do this?')
+            ) . '\')) roleForm.submit(\'' . $this->getUrl('*/*/delete') . '\'); return false;');
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.reload()')
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
+            ->setOnClick('roleForm.submit();return false;');
     }
 
     /**
@@ -84,7 +85,7 @@ public function getDeleteButtonHtml()
         if ((int) $this->getRequest()->getParam('rid') == 0) {
             return '';
         }
-        return $this->getChildHtml('deleteButton');
+        return parent::getDeleteButtonHtml();
     }
 
     public function getUser()
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index f5b84f39b90..75d25fd4863 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -76,7 +76,7 @@ public function __construct()
     }
 
     /**
-     * @return $this
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
@@ -88,17 +88,23 @@ protected function _prepareLayout()
                 ->setTemplate('report/store/switcher.phtml')
         );
 
-        $this->setChild(
-            'refresh_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Refresh'),
-                    'onclick'   => $this->getRefreshButtonCallback(),
-                    'class'   => 'task'
-                ])
-        );
-        parent::_prepareLayout();
-        return $this;
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        parent::addButtons();
+        $this->setChild(self::BUTTON_REFRESH, $this->getButtonRefreshBlock());
+    }
+
+    public function getButtonRefreshBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonRefreshBlock($name, $attributes)
+            ->setOnClick($this->getRefreshButtonCallback());
     }
 
     /**
@@ -170,12 +176,13 @@ protected function _prepareCollection()
          * Getting and saving store ids for website & group
          */
         $storeIds = [];
-        if ($this->getRequest()->getParam('store')) {
+        $request  = $this->getRequest();
+        if ($request->getParam('store')) {
             $storeIds = [$this->getParam('store')];
-        } elseif ($this->getRequest()->getParam('website')) {
-            $storeIds = Mage::app()->getWebsite($this->getRequest()->getParam('website'))->getStoreIds();
-        } elseif ($this->getRequest()->getParam('group')) {
-            $storeIds = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getStoreIds();
+        } elseif ($request->getParam('website')) {
+            $storeIds = Mage::app()->getWebsite($request->getParam('website'))->getStoreIds();
+        } elseif ($request->getParam('group')) {
+            $storeIds = Mage::app()->getGroup($request->getParam('group'))->getStoreIds();
         }
 
         // By default storeIds array contains only allowed stores
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
index 8896e9333cf..f21c0e64de1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
@@ -40,17 +40,25 @@ protected function _beforeToHtml()
      */
     protected function _prepareLayout()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'id'      => 'submit_comment_button',
-                'label'   => Mage::helper('sales')->__('Submit Comment'),
-                'class'   => 'save'
-            ]);
-        $this->setChild('submit_button', $button);
-
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSaveBlock());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setId('submit_comment_button')
+            ->setLabel(Mage::helper('sales')->__('Submit Comment'));
+    }
+
     public function getSubmitUrl()
     {
         return $this->getUrl('*/*/addComment', ['id' => $this->getEntity()->getId()]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
index f2d68e7a012..af390cd6c9a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
@@ -22,11 +22,7 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Customer extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setId('sales_order_create_customer');
-    }
+    protected $_idFieldName = 'sales_order_create_customer';
 
     /**
      * @return string
@@ -41,22 +37,16 @@ public function getHeaderText()
      */
     public function getButtonsHtml()
     {
-        $html = '';
-
-        $addButtonData = [
-            'label'     => Mage::helper('sales')->__('Create New Customer'),
-            'onclick'   => 'order.setCustomerId(false)',
-            'class'     => 'add',
-        ];
-        $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+        $customer = parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('sales')->__('Create New Customer'))
+            ->setOnClick('order.setCustomerId(false)')
+            ->toHtml();
 
-        $addButtonData = [
-            'label'     => Mage::helper('sales')->__('Create Guest Order'),
-            'onclick'   => 'order.setCustomerIsGuest()',
-            'class'     => 'add',
-        ];
-        $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+        $guest = parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('sales')->__('Create Guest Order'))
+            ->setOnClick('order.setCustomerIsGuest()')
+            ->toHtml();
 
-        return $html;
+        return $customer . $guest;
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php
index 58c81c8230b..f9642916931 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php
@@ -78,7 +78,7 @@ public function getButtonsHtml()
         // Make buttons to be rendered in opposite order of addition. This makes "Add products" the last one.
         $this->_buttons = array_reverse($this->_buttons);
         foreach ($this->_buttons as $buttonData) {
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData($buttonData)->toHtml();
+            $html .= parent::getButtonBlock()->setData($buttonData)->toHtml();
         }
 
         return $html;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
index 15a4ee03a69..24b45a505c8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -420,7 +420,7 @@ public function getConfigureButtonHtml($item)
             $options['title'] = Mage::helper('sales')->__('This product does not have any configurable options');
         }
 
-        return $this->getLayout()->createBlock('adminhtml/widget_button')
+        return parent::getButtonBlock()
             ->setData($options)
             ->toHtml();
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
index ea4f4c8ec2e..4d11d4e7c8f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
@@ -22,11 +22,7 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Search extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
 {
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setId('sales_order_create_search');
-    }
+    protected $_idFieldName = 'sales_order_create_search';
 
     /**
      * @return string
@@ -41,12 +37,10 @@ public function getHeaderText()
      */
     public function getButtonsHtml()
     {
-        $addButtonData = [
-            'label' => Mage::helper('sales')->__('Add Selected Product(s) to Order'),
-            'onclick' => 'order.productGridAddSelected()',
-            'class' => 'add',
-        ];
-        return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('sales')->__('Add Selected Product(s) to Order'))
+            ->setOnClick('order.productGridAddSelected()')
+            ->toHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
index ace38817559..f7c0ba90765 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
@@ -22,25 +22,32 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
 {
+    public const BUTTON_BOTTOM  = 'bottom_button';
+    public const BUTTON_TOP     = 'top_button';
+
     protected function _prepareLayout()
     {
         if ($this->getCustomerId()) {
-            $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label' => Mage::helper('sales')->__('Update Changes'),
-                'onclick' => 'order.sidebarApplyChanges()',
-                'before_html' => '<div class="sub-btn-set">',
-                'after_html' => '</div>'
-            ]);
-            $this->setChild('top_button', $button);
+            $button = $this->getButtonTopBlock();
+            $this->setChild(self::BUTTON_TOP, $button);
 
             $button = clone $button;
             $button->unsId();
-            $this->setChild('bottom_button', $button);
+            $this->setChild(self::BUTTON_BOTTOM, $button);
         }
 
         return parent::_prepareLayout();
     }
 
+    public function getButtonTopBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('sales')->__('Update Changes'))
+            ->setOnClick('order.sidebarApplyChanges()')
+            ->setBeforeHtml('<div class="sub-btn-set">')
+            ->setAfterHtml('</div>');
+    }
+
     public function canDisplay($child)
     {
         if (method_exists($child, 'canDisplay')) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php
index 2c783cd876d..fc4a95f22e1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php
@@ -22,6 +22,8 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract
 {
+    public const BUTTON_EMPTY_CUSTOMER_CART = 'empty_customer_cart_button';
+
     /**
      * Storage action on selected item
      *
@@ -29,10 +31,11 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart extends Mage_Adminhtm
      */
     protected $_sidebarStorageAction = 'add_cart_item';
 
+    protected $_idFieldName = 'sales_order_create_sidebar_cart';
+
     protected function _construct()
     {
         parent::_construct();
-        $this->setId('sales_order_create_sidebar_cart');
         $this->setDataId('cart');
     }
 
@@ -90,20 +93,31 @@ public function getProductId($item)
     }
 
     /**
+     * @codeCoverageIgnore
      * @inheritDoc
      */
     protected function _prepareLayout()
+    {
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_EMPTY_CUSTOMER_CART, $this->getButtonEmptyCustomerCartBlock());
+    }
+
+    public function getButtonEmptyCustomerCartBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $deleteAllConfirmString = Mage::helper('core')->jsQuoteEscape(
             Mage::helper('sales')->__('Are you sure you want to delete all items from shopping cart?')
         );
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-            'label' => Mage::helper('sales')->__('Clear Shopping Cart'),
-            'onclick' => 'order.clearShoppingCart(\'' . $deleteAllConfirmString . '\')',
-            'style' => 'float: right;'
-        ]);
-        $this->setChild('empty_customer_cart_button', $button);
-
-        return parent::_prepareLayout();
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('sales')->__('Clear Shopping Cart'))
+            ->setOnClick('order.clearShoppingCart(\'' . $deleteAllConfirmString . '\')')
+            ->setStyle('float: right;');
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
index f3d602dbbd0..44360fa223d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
@@ -22,6 +22,8 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract
 {
+    public const BUTTON_SUBMIT_OFFLINE  = 'submit_offline';
+
     protected $_canReturnToStock;
     /**
      * Prepare child blocks
@@ -30,49 +32,44 @@ class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items extends Mage_Admi
      */
     protected function _prepareLayout()
     {
-        $onclick = "submitAndReloadArea($('creditmemo_item_container'),'" . $this->getUpdateUrl() . "')";
-        $this->setChild(
-            'update_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('sales')->__('Update Qty\'s'),
-                'class'     => 'update-button',
-                'onclick'   => $onclick,
-            ])
-        );
+        $this->setChild(self::BUTTON_UPDATE, $this->getButtonUpdateBlock());
 
         if ($this->getCreditmemo()->canRefund()) {
             if ($this->getCreditmemo()->getInvoice() && $this->getCreditmemo()->getInvoice()->getTransactionId()) {
-                $this->setChild(
-                    'submit_button',
-                    $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                        'label'     => Mage::helper('sales')->__('Refund'),
-                        'class'     => 'save submit-button',
-                        'onclick'   => 'disableElements(\'submit-button\');submitCreditMemo()',
-                    ])
-                );
+                $this->setChild(self::BUTTON_SUBMIT, $this->getButtonRefundBlock());
             }
-            $this->setChild(
-                'submit_offline',
-                $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                    'label'     => Mage::helper('sales')->__('Refund Offline'),
-                    'class'     => 'save submit-button',
-                    'onclick'   => 'disableElements(\'submit-button\');submitCreditMemoOffline()',
-                ])
-            );
+            $this->setChild(self::BUTTON_SUBMIT_OFFLINE, $this->getButtonRefundOfflineBlock());
         } else {
-            $this->setChild(
-                'submit_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                    'label'     => Mage::helper('sales')->__('Refund Offline'),
-                    'class'     => 'save submit-button',
-                    'onclick'   => 'disableElements(\'submit-button\');submitCreditMemoOffline()',
-                ])
-            );
+            $this->setChild(self::BUTTON_SUBMIT, $this->getButtonRefundOfflineBlock());
         }
 
         return parent::_prepareLayout();
     }
 
+    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $onclick = "submitAndReloadArea($('creditmemo_item_container'),'" . $this->getUpdateUrl() . "')";
+        return parent::getButtonUpdateBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Update Qty\'s'))
+            ->setOnClick($onclick);
+    }
+
+    public function getButtonRefundBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Refund'))
+            ->setOnClick('disableElements(\'submit-button\');submitCreditMemo()')
+            ->addClass('submit-button');
+    }
+
+    public function getButtonRefundOfflineBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Refund Offline'))
+            ->setOnClick('disableElements(\'submit-button\');submitCreditMemoOffline()')
+            ->addClass('submit-button');
+    }
+
     /**
      * Retrieve invoice order
      *
@@ -139,11 +136,6 @@ public function canEditQty()
         return true;
     }
 
-    public function getUpdateButtonHtml()
-    {
-        return $this->getChildHtml('update_button');
-    }
-
     public function getUpdateUrl()
     {
         return $this->getUrl('*/*/updateQty', [
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
index d2a8d949563..05c8f902560 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
@@ -31,15 +31,21 @@ class Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items extends Mage_Adminht
      */
     protected function _beforeToHtml()
     {
-        $onclick = "submitAndReloadArea($('invoice_item_container'),'" . $this->getUpdateUrl() . "')";
-        $this->setChild(
-            'update_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'class'     => 'update-button',
-                'label'     => Mage::helper('sales')->__('Update Qty\'s'),
-                'onclick'   => $onclick,
-            ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_UPDATE, $this->getButtonUpdateBlock());
+        $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSubmitBlock());
+    }
+
+    public function getButtonSubmitBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
         $this->_disableSubmitButton = true;
         $submitButtonClass = ' disabled';
         foreach ($this->getInvoice()->getAllItems() as $item) {
@@ -57,17 +63,19 @@ protected function _beforeToHtml()
         } else {
             $submitLabel = Mage::helper('sales')->__('Submit Invoice');
         }
-        $this->setChild(
-            'submit_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => $submitLabel,
-                'class'     => 'save submit-button' . $submitButtonClass,
-                'onclick'   => 'disableElements(\'submit-button\');$(\'edit_form\').submit()',
-                'disabled'  => $this->_disableSubmitButton
-            ])
-        );
+        return parent::getButtonSaveBlock()
+            ->setLabel($submitLabel)
+            ->setOnClick('disableElements(\'submit-button\');$(\'edit_form\').submit()')
+            ->addClass('submit-button' . $submitButtonClass)
+            ->setDisabled($this->_disableSubmitButton);
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $onclick = "submitAndReloadArea($('invoice_item_container'),'" . $this->getUpdateUrl() . "')";
+        return parent::getButtonUpdateBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Update Qty\'s'))
+            ->setOnClick($onclick);
     }
 
     /**
@@ -143,11 +151,6 @@ public function formatPrice($price)
         return $this->getInvoice()->getOrder()->formatPrice($price);
     }
 
-    public function getUpdateButtonHtml()
-    {
-        return $this->getChildHtml('update_button');
-    }
-
     public function getUpdateUrl()
     {
         return $this->getUrl('*/*/updateQty', ['order_id' => $this->getInvoice()->getOrderId()]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
index cd04f85d05a..4324339fc50 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
@@ -22,30 +22,34 @@
  */
 class Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking extends Mage_Adminhtml_Block_Template
 {
-    public function _construct()
-    {
-        $this->setTemplate('sales/order/invoice/create/tracking.phtml');
-    }
+    protected $_template = 'sales/order/invoice/create/tracking.phtml';
 
     /**
-     * Prepares layout of block
-     *
+     * @codeCoverageIgnore
      * @return $this
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'add_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'   => Mage::helper('sales')->__('Add Tracking Number'),
-                    'class'   => '',
-                    'onclick' => 'trackingControl.add()'
-                ])
-        );
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Add Tracking Number'))
+            ->setOnClick('trackingControl.add()')
+            ->resetClass();
+    }
+
     /**
      * Retrieve shipment model instance
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
index 00d9da1865d..722ca731246 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
@@ -57,18 +57,19 @@ public function getShipment()
      */
     protected function _beforeToHtml()
     {
-        $this->setChild(
-            'submit_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('sales')->__('Submit Shipment'),
-                'class'     => 'save submit-button',
-                'onclick'   => 'submitShipment(this);',
-            ])
-        );
+        $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSubmitBlock());
 
         return parent::_beforeToHtml();
     }
 
+    public function getButtonSubmitBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock()
+            ->setLabel(Mage::helper('sales')->__('Submit Shipment'))
+            ->setOnClick('submitShipment(this);')
+            ->addClass('submit-button');
+    }
+
     /**
      * Format given price
      *
@@ -80,16 +81,6 @@ public function formatPrice($price)
         return $this->getShipment()->getOrder()->formatPrice($price);
     }
 
-    /**
-     * Retrieve HTML of update button
-     *
-     * @return string
-     */
-    public function getUpdateButtonHtml()
-    {
-        return $this->getChildHtml('update_button');
-    }
-
     /**
      * Get url for update
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
index 3377a08cc7f..79fd04099c8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
@@ -29,18 +29,26 @@ class Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking extends Mage_Adm
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'add_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'   => Mage::helper('sales')->__('Add Tracking Number'),
-                    'class'   => '',
-                    'onclick' => 'trackingControl.add()'
-                ])
-        );
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Add Tracking Number'))
+            ->setOnClick('trackingControl.add()')
+            ->resetClass();
+    }
+
     /**
      * Retrieve shipment model instance
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
index 7ea300b44ff..917b3bf9531 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
@@ -29,19 +29,26 @@ class Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking extends Mage_Admin
      */
     protected function _prepareLayout()
     {
-        $onclick = "submitAndReloadArea($('shipment_tracking_info').parentNode, '" . $this->getSubmitUrl() . "')";
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'   => Mage::helper('sales')->__('Add'),
-                    'class'   => 'save',
-                    'onclick' => $onclick
-                ])
-        );
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $onclick = "submitAndReloadArea($('shipment_tracking_info').parentNode, '" . $this->getSubmitUrl() . "')";
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Add'))
+            ->setOnClick($onclick);
+    }
+
     /**
      * Retrieve shipment model instance
      *
@@ -62,16 +69,6 @@ public function getSubmitUrl()
         return $this->getUrl('*/*/addTrack/', ['shipment_id' => $this->getShipment()->getId()]);
     }
 
-    /**
-     * Retrieve save button html
-     *
-     * @return string
-     */
-    public function getSaveButtonHtml()
-    {
-        return $this->getChildHtml('save_button');
-    }
-
     /**
      * Retrieve remove url
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
index 0ba762aa5c3..cacea74b06f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -67,29 +67,28 @@ protected function _beforeToHtml()
     protected function _prepareLayout()
     {
         if ($this->isModuleOutputEnabled('Mage_GiftMessage')) {
-            $this->setChild(
-                'save_button',
-                $this->getLayout()->createBlock('adminhtml/widget_button')
-                    ->setData([
-                        'label'   => Mage::helper('giftmessage')->__('Save Gift Message'),
-                        'class'   => 'save'
-                    ])
-            );
+            $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
         }
         return $this;
     }
 
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('giftmessage')->__('Save Gift Message'));
+    }
+
     /**
      * @return string
      * @throws Exception
      */
     public function getSaveButtonHtml()
     {
-        $this->getChild('save_button')->setOnclick(
-            'giftMessagesController.saveGiftMessage(\'' . $this->getHtmlId() . '\')'
-        );
-
-        return $this->getChildHtml('save_button');
+        $this->getChild(self::BUTTON_SAVE)
+            ->setOnClick(
+                'giftMessagesController.saveGiftMessage(\'' . $this->getHtmlId() . '\')'
+            );
+        return parent::getSaveButtonHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
index 4e04ac01d7f..9e6667d8499 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
@@ -28,17 +28,26 @@ class Mage_Adminhtml_Block_Sales_Order_View_History extends Mage_Adminhtml_Block
      */
     protected function _prepareLayout()
     {
-        $onclick = "submitAndReloadArea($('order_history_block').parentNode, '" . $this->getSubmitUrl() . "')";
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label'   => Mage::helper('sales')->__('Submit Comment'),
-                'class'   => 'save',
-                'onclick' => $onclick
-            ]);
-        $this->setChild('submit_button', $button);
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSaveBlock());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $onclick = "submitAndReloadArea($('order_history_block').parentNode, '" . $this->getSubmitUrl() . "')";
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('sales')->__('Submit Comment'))
+            ->setOnClick($onclick);
+    }
+
     public function getStatuses()
     {
         $state = $this->getOrder()->getState();
@@ -53,6 +62,7 @@ public function canSendCommentEmail()
     /**
      * Retrieve order model
      *
+     * @codeCoverageIgnore
      * @return Mage_Sales_Model_Order
      */
     public function getOrder()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
index 0da30a8ca15..6d377868000 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
@@ -39,18 +39,25 @@ public function __construct()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Save Cache Settings'),
-                    'onclick'   => 'configForm.submit()',
-                    'class' => 'save',
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Cache Settings'))
+            ->setOnClick('configForm.submit()');
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
index 6da40c56e4b..792c66a0de0 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
@@ -51,18 +51,25 @@ public function __construct()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Save Config'),
-                    'onclick'   => 'configForm.submit()',
-                    'class' => 'save',
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Config'))
+            ->setOnClick('configForm.submit()');
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php
index 3a3a0b3b2bb..834e2760e37 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php
@@ -79,14 +79,13 @@ public function getAjaxStatusUpdateUrl()
      */
     public function getButtonHtml()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'id'        => 'synchronize_button',
-                'label'     => $this->helper('adminhtml')->__('Synchronize'),
-                'onclick'   => 'javascript:synchronize(); return false;'
-            ]);
-
-        return $button->toHtml();
+        /** @var Mage_Adminhtml_Block_Widget_Button $button */
+        $button = $this->getLayout()->createBlock('adminhtml/widget_button');
+        return $button
+            ->setId('synchronize_button')
+            ->setLabel($this->helper('adminhtml')->__('Synchronize'))
+            ->setOnClick('javascript:synchronize(); return false;')
+            ->toHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
index 85e0cc3fe5a..b7a1c7bd397 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
@@ -255,47 +255,68 @@ public function getStoreSelectOptions()
      */
     public function getStoreButtonsHtml()
     {
-        $curWebsite = $this->getRequest()->getParam('website');
-        $curStore = $this->getRequest()->getParam('store');
+        $request    = $this->getRequest();
+        $curWebsite = $request->getParam('website');
+        $curStore   = $request->getParam('store');
 
         $html = '';
 
         if (!$curWebsite && !$curStore) {
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('New Website'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_website/new') . "'",
-                'class'     => 'add',
-            ])->toHtml();
+            $html .= $this->getButtonNewWebsiteBlock()->toHtml();
         } elseif (!$curStore) {
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('Edit Website'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_website/edit', ['website' => $curWebsite]) . "'",
-            ])->toHtml();
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('New Store View'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_store/new', ['website' => $curWebsite]) . "'",
-                'class'     => 'add',
-            ])->toHtml();
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('Delete Website'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_website/delete', ['website' => $curWebsite]) . "'",
-                'class'     => 'delete',
-            ])->toHtml();
+            $html .= $this->getButtonEditWebsiteBlock()->toHtml();
+            $html .= $this->getButtonNewStoreViewBlock()->toHtml();
+            $html .= $this->getButtonDeleteWebsiteBlock()->toHtml();
         } else {
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('Edit Store View'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_store/edit', ['store' => $curStore]) . "'",
-            ])->toHtml();
-            $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                'label'     => Mage::helper('adminhtml')->__('Delete Store View'),
-                'onclick'   => "location.href='" . $this->getUrl('*/system_store/delete', ['store' => $curStore]) . "'",
-                'class'     => 'delete',
-            ])->toHtml();
+            $html .= $this->getButtonEditStoreViewBlock()->toHtml();
+            $html .= $this->getButtonDeleteStoreViewBlock()->toHtml();
         }
 
         return $html;
     }
 
+    public function getButtonDeleteStoreViewBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Store View'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_store/delete', ['store' => $this->getRequest()->getParam('store')]) . "'");
+    }
+
+    public function getButtonEditStoreViewBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Edit Store View'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_store/edit', ['store' => $this->getRequest()->getParam('store')]) . "'");
+    }
+
+    public function getButtonNewStoreViewBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('New Store View'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_store/new', ['website' => $this->getRequest()->getParam('website')]) . "'");
+    }
+
+    public function getButtonDeleteWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Website'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_website/delete', ['website' => $this->getRequest()->getParam('website')]) . "'");
+    }
+
+    public function getButtonEditWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Edit Website'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_website/edit', ['website' => $this->getRequest()->getParam('website')]) . "'");
+    }
+
+    public function getButtonNewWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('New Website'))
+            ->setOnClick("location.href='" . $this->getUrl('*/system_website/new') . "'");
+    }
+
     /**
      * @param string $code
      * @return bool
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
index b68ace08125..6cabc312886 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -123,9 +123,10 @@ public function getMappings($entityType)
     public function getAddMapButtonHtml()
     {
         if (!$this->_addMapButtonHtml) {
-            $this->_addMapButtonHtml = $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button')
-                ->setClass('add')->setLabel($this->__('Add Field Mapping'))
-                ->setOnClick('addFieldMapping()')->toHtml();
+            $this->_addMapButtonHtml = $this->getButtonAddBlock()
+                ->setLabel($this->__('Add Field Mapping'))
+                ->setOnClick('addFieldMapping()')
+                ->toHtml();
         }
         return $this->_addMapButtonHtml;
     }
@@ -136,9 +137,10 @@ public function getAddMapButtonHtml()
     public function getRemoveMapButtonHtml()
     {
         if (!$this->_removeMapButtonHtml) {
-            $this->_removeMapButtonHtml = $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button')
-                ->setClass('delete')->setLabel($this->__('Remove'))
-                ->setOnClick('removeFieldMapping(this)')->toHtml();
+            $this->_removeMapButtonHtml = $this->getButtonDeleteBlock()
+                ->setLabel($this->__('Remove'))
+                ->setOnClick('removeFieldMapping(this)')
+                ->toHtml();
         }
         return $this->_removeMapButtonHtml;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
index 666dd076a48..a331efc7508 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
@@ -26,12 +26,10 @@ class Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Run extends Mage_Admi
 
     public function getRunButtonHtml()
     {
-        $html = $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button')
-            ->setClass('save')->setLabel($this->__('Run Profile in Popup'))
+        return parent::getButtonSaveBlock()
+            ->setLabel($this->__('Run Profile in Popup'))
             ->setOnClick('runProfile(true)')
             ->toHtml();
-
-        return $html;
     }
 
     public function getProfileId()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
index 48d4f1328e6..3103f64df9a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
@@ -22,10 +22,11 @@
  */
 class Mage_Adminhtml_Block_System_Currency extends Mage_Adminhtml_Block_Template
 {
-    public const BUTTON_IMPORT          = 'import_button';
     public const BLOCK_IMPORT_SERVICES  = 'import_services';
     public const BLOCK_RATE_MATRIX      = 'rates_matrix';
 
+    public const BUTTON_IMPORT          = 'import_button';
+
     protected $_template = 'system/currency/rates.phtml';
 
     /**
@@ -33,36 +34,6 @@ class Mage_Adminhtml_Block_System_Currency extends Mage_Adminhtml_Block_Template
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Save Currency Rates'),
-                    'onclick'   => 'currencyForm.submit();',
-                    'class'     => 'save'
-            ])
-        );
-
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Reset'),
-                    'onclick'   => 'document.location.reload()',
-                    'class'     => 'reset'
-            ])
-        );
-
-        $this->setChild(
-            'import_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Import'),
-                    'class'     => 'add',
-                    'type'      => 'submit',
-            ])
-        );
-
         $this->setChild(
             self::BLOCK_RATE_MATRIX,
             $this->getLayout()->createBlock('adminhtml/system_currency_rate_matrix')
@@ -73,9 +44,40 @@ protected function _prepareLayout()
             $this->getLayout()->createBlock('adminhtml/system_currency_rate_services')
         );
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_IMPORT, $this->getButtonImportBlock());
+    }
+
+    public function getButtonImportBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Import'))
+            ->setType(Mage_Adminhtml_Block_Widget_Button::TYPE_SUBMIT);
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('document.location.reload()');
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Currency Rates'))
+            ->setOnClick('currencyForm.submit();');
+    }
+
     protected function getHeader()
     {
         return Mage::helper('adminhtml')->__('Manage Currency Rates');
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php
index 4d77e2e8051..9b5e90e35d0 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php
@@ -32,17 +32,24 @@ class Mage_Adminhtml_Block_System_Design extends Mage_Adminhtml_Block_Template
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'add_new_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('catalog')->__('Add Design Change'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/new')),
-                    'class'     => 'add'
-                ])
-        );
-
-        $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_design_grid', 'design.grid'));
+        $this->setChild(self::BLOCK_GRID, $this->getLayout()->createBlock('adminhtml/system_design_grid', 'design.grid'));
+
+        $this->addButtons();
         return parent::_prepareLayout();
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('catalog')->__('Add Design Change'))
+            ->setOnClickSetLocationJsUrl('*/*/new');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
index 51c6503b6eb..ef4d4fcd7ac 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
@@ -30,36 +30,36 @@ class Mage_Adminhtml_Block_System_Design_Edit extends Mage_Adminhtml_Block_Widge
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Back'),
-                    'onclick'   => Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/')),
-                    'class'     => 'back'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Save'),
-                    'onclick'   => 'designForm.submit()',
-                    'class'     => 'save'
-                ])
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Delete'),
-                    'onclick'   => Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()),
-                    'class'     => 'delete'
-                ])
-        );
-        return parent::_prepareLayout();
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl();
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setOnClickSetLocationJsFullUrl($this->getDeleteUrl());
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setOnClick('designForm.submit()');
     }
 
     public function getDesignChangeId()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
index ede894165f6..a58f14a9dd2 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
@@ -32,18 +32,29 @@ class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Te
     protected function _prepareLayout()
     {
         $this->setChild(
-            'add_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Add New Template'),
-                    'onclick'   => "window.location='" . $this->getCreateUrl() . "'",
-                    'class'     => 'add'
-            ])
+            self::BLOCK_GRID,
+            $this->getLayout()->createBlock('adminhtml/system_email_template_grid', 'email.template.grid')
         );
-        $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_email_template_grid', 'email.template.grid'));
+
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Add New Template'))
+            ->setOnClick("window.location='" . $this->getCreateUrl() . "'");
+    }
+
     /**
      * Get URL for create new email template
      *
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
index fd54609d031..0011cd450d6 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -37,126 +37,89 @@ class Mage_Adminhtml_Block_System_Email_Template_Edit extends Mage_Adminhtml_Blo
     protected function _prepareLayout()
     {
         $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Back'),
-                        'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
-                        'class'   => 'back'
-                    ]
-                )
+            self::BLOCK_FORM,
+            $this->getLayout()->createBlock('adminhtml/system_email_template_edit_form')
         );
 
-        $this->setChild(
-            'reset_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Reset'),
-                        'onclick' => 'window.location.href = window.location.href'
-                    ]
-                )
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Delete Template'),
-                        'onclick' => 'templateControl.deleteTemplate();',
-                        'class'   => 'delete'
-                    ]
-                )
-        );
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_TO_PLAIN, $this->getButtonToPlainBlock());
+        $this->setChild(self::BUTTON_TO_HTML, $this->getButtonToHtmllock());
+        $this->setChild(self::BUTTON_TOGGLE, $this->getButtonToggleBlock());
+        $this->setChild(self::BUTTON_PREVIEW, $this->getButtonPreviewBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_LOAD, $this->getButtonLoadBlock());
+    }
 
-        $this->setChild(
-            'to_plain_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Convert to Plain Text'),
-                        'onclick' => 'templateControl.stripTags();',
-                        'id'      => 'convert_button'
-                    ]
-                )
-        );
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Template'))
+            ->setOnClick('templateControl.deleteTemplate();');
+    }
 
-        $this->setChild(
-            'to_html_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Return Html Version'),
-                        'onclick' => 'templateControl.unStripTags();',
-                        'id'      => 'convert_button_back',
-                        'style'   => 'display:none'
-                    ]
-                )
-        );
+    public function getButtonLoadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Load Template'))
+            ->setOnClick('templateControl.load();')
+            ->setType('button');
+    }
 
-        $this->setChild(
-            'toggle_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Toggle Editor'),
-                        'onclick' => 'templateControl.toggleEditor();',
-                        'id'      => 'toggle_button'
-                    ]
-                )
-        );
+    public function getButtonPreviewBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Preview Template'))
+            ->setOnClick('templateControl.preview();');
+    }
 
-        $this->setChild(
-            'preview_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Preview Template'),
-                        'onclick' => 'templateControl.preview();'
-                    ]
-                )
-        );
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.href = window.location.href')
+            ->resetClass();
+    }
 
-        $this->setChild(
-            'save_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Save Template'),
-                        'onclick' => 'templateControl.save();',
-                        'class'   => 'save'
-                    ]
-                )
-        );
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Template'))
+            ->setOnClick('templateControl.save();');
+    }
 
-        $this->setChild(
-            'load_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(
-                    [
-                        'label'   => Mage::helper('adminhtml')->__('Load Template'),
-                        'onclick' => 'templateControl.load();',
-                        'type'    => 'button',
-                        'class'   => 'save'
-                    ]
-                )
-        );
+    public function getButtonToHtmllock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setId('convert_button_back')
+            ->setLabel(Mage::helper('adminhtml')->__('Return Html Version'))
+            ->setOnClick('templateControl.unStripTags();')
+            ->setStyle('display:none');
+    }
 
-        $this->setChild(
-            self::BLOCK_FORM,
-            $this->getLayout()->createBlock('adminhtml/system_email_template_edit_form')
-        );
-        return parent::_prepareLayout();
+    public function getButtonToPlainBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->setId('convert_button')
+            ->setLabel(Mage::helper('adminhtml')->__('Convert to Plain Text'))
+            ->setOnClick('templateControl.stripTags();');
     }
 
-    /**
-     * @return string
-     */
-    public function getBackButtonHtml()
+    public function getButtonToggleBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('back_button');
+        return parent::getButtonBlock($name, $attributes)
+            ->setId('toggle_button')
+            ->setLabel(Mage::helper('adminhtml')->__('Toggle Editor'))
+            ->setOnClick('templateControl.toggleEditor();');
     }
 
     /**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
index ed050be1b5f..2ad1624cec8 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
@@ -23,43 +23,53 @@
  */
 class Mage_Adminhtml_Block_System_Store_Delete_Group extends Mage_Adminhtml_Block_Template
 {
+    public const DATA_ID = 'group_id';
+
+    public const BUTTON_CONFIRM_DELETE  = 'confirm_deletion_button';
+
+    protected $_template = 'system/store/delete_group.phtml';
+
     /**
      * @inheritDoc
      */
     protected function _prepareLayout()
     {
-        $itemId = $this->getRequest()->getParam('group_id');
-
-        $this->setTemplate('system/store/delete_group.phtml');
+        $itemId = $this->getRequest()->getParam(self::DATA_ID);
         $this->setAction($this->getUrl('*/*/deleteGroupPost', ['group_id' => $itemId]));
-        $this->setChild(
-            'confirm_deletion_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Delete Store'),
-                    'onclick'   => 'deleteForm.submit()',
-                    'class'     => 'cancel'
-                ])
-        );
-        $onClick = Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/editGroup', ['group_id' => $itemId]));
-        $this->setChild(
-            'cancel_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Cancel'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ])
-        );
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Back'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ])
-        );
+
+        $this->addButtons();
         return parent::_prepareLayout();
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_CONFIRM_DELETE, $this->getButtonConfirmDeleteBlock());
+        $this->setChild(self::BUTTON_CANCEL, $this->getButtonCancelBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+    }
+
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $itemId = $this->getRequest()->getParam(self::DATA_ID);
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/*/editGroup', [self::DATA_ID => $itemId])
+            ->setClass(self::BUTTON__CLASS_CANCEL);
+    }
+
+    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $itemId = $this->getRequest()->getParam(self::DATA_ID);
+        return parent::getButtonCancelBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/*/editGroup', [self::DATA_ID => $itemId]);
+    }
+
+    public function getButtonConfirmDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonCancelBlock($name, $attributes)
+            ->setLabel(Mage::helper('core')->__('Delete Store'))
+            ->setOnClick('deleteForm.submit()');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
index 002ed82eae3..80bc8532989 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
@@ -14,7 +14,6 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
  * Adminhtml store delete group block
  *
@@ -23,43 +22,54 @@
  */
 class Mage_Adminhtml_Block_System_Store_Delete_Website extends Mage_Adminhtml_Block_Template
 {
+    public const DATA_ID                = 'website_id';
+
+    public const BUTTON_DELETE          = 'confirm_deletion_button';
+
+    protected $_template = 'system/store/delete_website.phtml';
+
     /**
      * @inheritDoc
      */
     protected function _prepareLayout()
     {
-        $itemId = $this->getRequest()->getParam('website_id');
+        $itemId = $this->getRequest()->getParam(self::DATA_ID);
+        $this->setAction($this->getUrl('*/*/deleteWebsitePost', [self::DATA_ID => $itemId]));
 
-        $this->setTemplate('system/store/delete_website.phtml');
-        $this->setAction($this->getUrl('*/*/deleteWebsitePost', ['website_id' => $itemId]));
-        $this->setChild(
-            'confirm_deletion_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Delete Website'),
-                    'onclick'   => 'deleteForm.submit()',
-                    'class'     => 'cancel'
-                ])
-        );
-        $onClick = Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/editWebsite', ['website_id' => $itemId]));
-        $this->setChild(
-            'cancel_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Cancel'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ])
-        );
-        $this->setChild(
-            'back_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('core')->__('Back'),
-                    'onclick'   => $onClick,
-                    'class'     => 'cancel'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_CANCEL, $this->getButtonCancelBlock());
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+    }
+
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $itemId  = $this->getRequest()->getParam(self::DATA_ID);
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/*/editWebsite', [self::DATA_ID => $itemId])
+            ->setClass(self::BUTTON__CLASS_CANCEL);
+    }
+
+    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        $itemId  = $this->getRequest()->getParam(self::DATA_ID);
+        return parent::getButtonCancelBlock($name, $attributes)
+            ->setOnClickSetLocationJsUrl('*/*/editWebsite', [self::DATA_ID => $itemId]);
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('core')->__('Delete Website'))
+            ->setOnClick('deleteForm.submit()')
+            ->setClass(self::BUTTON__CLASS_CANCEL);
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
index a12b3ce2e2f..18bb9206994 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
@@ -32,15 +32,22 @@ class Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add extends Mage_Adminhtml_Block_Tem
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'addButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('tax')->__('Add New Tax Rate'),
-                    'onclick' => 'window.location.href=\'' . $this->getUrl('*/tax_rate/add') . '\'',
-                    'class' => 'add'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('tax')->__('Add New Tax Rate'))
+            ->setOnClick('window.location.href=\'' . $this->getUrl('*/tax_rate/add') . '\'');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
index c25e2fb9ca3..07bfeeae803 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
@@ -45,47 +45,39 @@ public function __construct()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'backButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('tax')->__('Back'),
-                    'onclick'   => 'window.location.href=\'' . $this->getUrl('*/*/') . '\'',
-                    'class'     => 'back'
-                ])
-        );
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        $this->setChild(
-            'resetButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('tax')->__('Reset'),
-                    'onclick'   => 'window.location.reload()'
-                ])
-        );
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('tax')->__('Delete Rate'))
+            ->setOnClickSetLocationJsUrl('*/*/delete', ['rate' => $this->getRequest()->getParam('rate')]);
+    }
 
-        $this->setChild(
-            'saveButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('tax')->__('Save Rate'),
-                    'onclick'   => 'wigetForm.submit();return false;',
-                    'class'     => 'save'
-                ])
-        );
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.reload()');
+    }
 
-        $this->setChild(
-            'deleteButton',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('tax')->__('Delete Rate'),
-                    'onclick'   => Mage::helper('core/js')->getDeleteConfirmJs(
-                        $this->getUrl('*/*/delete', ['rate' => $this->getRequest()->getParam('rate')])
-                    ),
-                    'class'     => 'delete'
-                ])
-        );
-        return parent::_prepareLayout();
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('tax')->__('Save Rate'))
+            ->setOnClick('wigetForm.submit();return false;');
     }
 
     /**
@@ -97,6 +89,6 @@ public function getDeleteButtonHtml()
         if ((int) $this->getRequest()->getParam('rate') == 0) {
             return '';
         }
-        return $this->getChildHtml('deleteButton');
+        return parent::getDeleteButtonHtml();
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index b4e7ff309d3..8acc02ae04f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -40,7 +40,7 @@ class Mage_Adminhtml_Block_Template extends Mage_Core_Block_Template
     public const BUTTON__CLASS_BACK         = 'back';
     public const BUTTON__CLASS_CANCEL       = 'cancel';
     public const BUTTON__CLASS_DELETE       = 'delete';
-    public const BUTTON__CLASS_RESET        = 'reeet';
+    public const BUTTON__CLASS_RESET        = 'reset';
     public const BUTTON__CLASS_SAVE         = 'save';
     public const BUTTON__CLASS_TASK         = 'task';
     public const BUTTON__CLASS_UPDATE       = 'update-button';
@@ -124,7 +124,7 @@ private function createWidgetBackButtonBlock(string $name = '', array $attribute
     {
         return $this->createWidgetButtonBlock($name, $attributes)
             ->setLabel(Mage::helper('adminhtml')->__('Back'))
-            ->setOnClickSetLocationJsUrl()
+            ->setOnClick("window.location.href='" . $this->getUrl('*/*') . "'")
             ->setClass(self::BUTTON__CLASS_BACK);
     }
 
@@ -229,7 +229,6 @@ private function createWidgetSaveAndContinueButtonBlock(string $name = '', array
     {
         return $this->createWidgetButtonBlock($name, $attributes)
             ->setLabel(Mage::helper('adminhtml')->__('Save and Continue Edit'))
-            ->setOnClick(Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()))
             ->setClass(self::BUTTON__CLASS_SAVE);
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index b3e56c36a57..bc84ff24d00 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -91,17 +91,8 @@ protected function _prepareLayout()
                     'categories_tree',
                     $this->getLayout()->createBlock('adminhtml/urlrewrite_category_tree')
                 );
-                $this->setChild(
-                    self::BUTTON_SKIP_CATEGORIES,
-                    $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
-                        'label'   => Mage::helper('adminhtml')->__('Skip Category Selection'),
-                        'onclick' => 'window.location = \'' . Mage::helper('adminhtml')->getUrl('*/*/*', [
-                            'product' => $this->getProductId()
-                            ]) . '\'',
-                        'class'   => 'save',
-                        'level'   => -1
-                    ])
-                );
+                $this->setChild(self::BUTTON_SKIP_CATEGORIES, $this->getButtonSkipCategoriesBlock());
+
                 $this->_updateButton(
                     'back',
                     'onclick',
@@ -128,6 +119,16 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
+    public function getButtonSkipCategoriesBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Skip Category Selection'))
+            ->setOnClick('window.location = \'' . Mage::helper('adminhtml')->getUrl('*/*/*', [
+                    'product' => $this->getProductId()
+                ]) . '\'')
+            ->setLevel(-1);
+    }
+
     /**
      * Add edit form as child block and add appropriate buttons
      *
@@ -257,8 +258,11 @@ public function isMode($mode)
     public function updateModeLayout($mode = null)
     {
         if (!$mode) {
-            $modes = array_keys(Mage::getBlockSingleton('adminhtml/urlrewrite_selector')->getModes());
-            $mode  = array_shift($modes);
+            $rewriteSelector = Mage::getBlockSingleton('adminhtml/urlrewrite_selector');
+            if ($rewriteSelector) {
+                $modes = array_keys($rewriteSelector->getModes());
+                $mode  = array_shift($modes);
+            }
         }
 
         // edit form for new custom urlrewrite
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php
index 4603ac32cd8..41a49017409 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget.php
@@ -76,14 +76,12 @@ protected function _addBreadcrumb($label, $title = null, $link = null)
      */
     public function getButtonHtml($label, $onclick, $class = '', $id = null)
     {
-        return $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label'     => $label,
-                'onclick'   => $onclick,
-                'class'     => $class,
-                'type'      => 'button',
-                'id'        => $id,
-            ])
+        return parent::getButtonBlock()
+            ->setLabel($label)
+            ->setOnClick($onclick)
+            ->setClass($class)
+            ->setId($id)
+            ->setType('button')
             ->toHtml();
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index a8fbc946cc1..ff80da2dad4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -192,7 +192,7 @@ protected function _prepareButtonBlockId($id)
      */
     protected function _addButtonChildBlock($childId)
     {
-        $block = $this->getLayout()->createBlock('adminhtml/widget_button');
+        $block = parent::getButtonBlock();
         $this->setChild($childId, $block);
         return $block;
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
index 217224ae8be..0fbc30561c2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
@@ -54,30 +54,34 @@ public function getValues()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Delete'),
-                    'onclick'   => 'deleteImage(#image#)',
-                    'class' => 'delete'
-            ])
-        );
-
-        $this->setChild(
-            'add_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Add New Image'),
-                    'onclick'   => 'addNewImage()',
-                    'class' => 'add'
-            ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
-    public function getDeleteButtonHtml($image)
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Add New Image'))
+            ->setOnClick('addNewImage()');
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setOnClick('deleteImage(#image#)');
+    }
+
+    public function getDeleteImageButtonHtml($image)
     {
-        return str_replace('#image#', $image, $this->getChildHtml('delete_button'));
+        return str_replace('#image#', $image, $this->getChildHtml(self::BUTTON_DELETE));
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index b73edfef156..2d75bedafcb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -237,35 +237,43 @@ public function __construct($attributes = [])
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'export_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Export'),
-                    'onclick'   => $this->getJsObjectName() . '.doExport()',
-                    'class'   => 'task'
-                ])
-        );
-        $this->setChild(
-            'reset_filter_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Reset Filter'),
-                    'onclick'   => $this->getJsObjectName() . '.resetFilter()',
-                ])
-        );
-        $this->setChild(
-            'search_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label'     => Mage::helper('adminhtml')->__('Search'),
-                    'onclick'   => $this->getJsObjectName() . '.doFilter()',
-                    'class'   => 'task'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_EXPORT, $this->getButtonExportlock());
+        $this->setChild(self::BUTTON_RESET_FILTER, $this->getButtonResetFilterBlock());
+        $this->setChild(self::BUTTON_SEARCH, $this->getButtonSearchBlock());
+    }
+
+    public function getButtonExportlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Export'))
+            ->setOnClick($this->getJsObjectName() . '.doExport()')
+            ->setClass(self::BUTTON__CLASS_TASK);
+    }
+
+    public function getButtonResetFilterBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Reset Filter'))
+            ->setOnClick($this->getJsObjectName() . '.resetFilter()');
+    }
+
+    public function getButtonSearchBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock()
+            ->setLabel(Mage::helper('adminhtml')->__('Search'))
+            ->setOnClick($this->getJsObjectName() . '.doFilter()')
+            ->setClass(self::BUTTON__CLASS_TASK);
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
index 432310e262a..a770f1ffe7f 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
@@ -33,25 +33,29 @@ class Mage_Api2_Block_Adminhtml_Attribute_Buttons extends Mage_Adminhtml_Block_T
      */
     protected function _prepareLayout()
     {
-        $buttons = [
-            'backButton'    => [
-                'label'     => $this->__('Back'),
-                'onclick'   => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
-                'class'     => 'back'
-            ],
-            'saveButton'    => [
-                'label'     => $this->__('Save'),
-                'onclick'   => 'form.submit(); return false;',
-                'class'     => 'save'
-            ],
-        ];
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+    }
 
-        foreach ($buttons as $name => $data) {
-            $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
-            $this->setChild($name, $button);
-        }
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick(sprintf("window.location.href='%s';", $this->getUrl('*/*/')));
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setOnClick('form.submit(); return false;');
     }
 
     /**
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
index 037f87fdf9a..5f7341f4405 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
@@ -38,34 +38,46 @@ class Mage_Api2_Block_Adminhtml_Roles_Buttons extends Mage_Adminhtml_Block_Templ
      */
     protected function _prepareLayout()
     {
-        $buttons = [
-            'backButton'    => [
-                'label'     => Mage::helper('adminhtml')->__('Back'),
-                'onclick'   => sprintf("window.location.href='%s';", $this->getUrl('*/*/')),
-                'class'     => 'back'
-            ],
-            'resetButton'   => [
-                'label'     => Mage::helper('adminhtml')->__('Reset'),
-                'onclick'   => 'window.location.reload()'
-            ],
-            'saveButton'    => [
-                'label'     => Mage::helper('adminhtml')->__('Save Role'),
-                'onclick'   => 'roleForm.submit(); return false;',
-                'class'     => 'save'
-            ],
-            'deleteButton'  => [
-                'label'     => Mage::helper('adminhtml')->__('Delete Role'),
-                'onclick'   => '',  //roleId is not set at this moment, so we set script later
-                'class'     => 'delete'
-            ],
-        ];
+        $this->addButtons();
+        return parent::_prepareLayout();
+    }
 
-        foreach ($buttons as $name => $data) {
-            $button = $this->getLayout()->createBlock('adminhtml/widget_button')->setData($data);
-            $this->setChild($name, $button);
-        }
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
+        $this->setChild(self::BUTTON_RESET, $this->getButtonResetBlock());
+        $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
 
-        return parent::_prepareLayout();
+    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBackBlock($name, $attributes)
+            ->setOnClick(sprintf("window.location.href='%s';", $this->getUrl('*/*/')));
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
+            ->setOnClick('window.location.reload()');
+    }
+
+    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonResetBlock($name, $attributes)
+            ->setOnClick('window.location.reload()')
+            ->resetClass();
+    }
+
+    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonSaveBlock($name, $attributes)
+            ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
+            ->setOnClick('roleForm.submit(); return false;');
     }
 
     /**
@@ -85,7 +97,7 @@ public function getDeleteButtonHtml()
             $this->getUrl('*/*/delete')
         ));
 
-        return $this->getChildHtml('deleteButton');
+        return parent::getDeleteButtonHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 8c20bd121fb..b255445abff 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -55,17 +55,6 @@ public function getTabClass()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            self::BLOCK_OPTION_BOX,
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('bundle')->__('Add New Option'),
-                    'class' => 'add',
-                    'id'    => 'add_new_option',
-                    'on_click' => 'bOption.add()'
-                ])
-        );
-
         $this->setChild(
             self::BLOCK_OPTION_BOX,
             $this->getLayout()->createBlock(
@@ -74,9 +63,26 @@ protected function _prepareLayout()
             )
         );
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setId('add_new_option')
+            ->setLabel(Mage::helper('bundle')->__('Add New Option'))
+            ->setOnClick('bOption.add();');
+    }
+
     /**
      * Check block readonly
      *
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 3e7bf5110fd..0bcebaaf01a 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -146,50 +146,48 @@ protected function _prepareLayout()
     {
         $this->setChild(
             self::BLOCK_SELCTION_TEMPLATE,
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'id'    => $this->getFieldId() . '_{{index}}_add_button',
-                    'label'     => Mage::helper('bundle')->__('Add Selection'),
-                    'on_click'   => 'bSelection.showSearch(event)',
-                    'class' => 'add'
-                ])
-        );
-
-        $this->setChild(
-            'close_search_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'id'    => $this->getFieldId() . '_{{index}}_close_button',
-                    'label'     => Mage::helper('bundle')->__('Close'),
-                    'on_click'   => 'bSelection.closeSearch(event)',
-                    'class' => 'back no-display'
-                ])
-        );
-
-        $this->setChild(
-            'option_delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Delete Option'),
-                    'class' => 'delete delete-product-option',
-                    'on_click' => 'bOption.remove(event)'
-                ])
-        );
-
-        $this->setChild(
-            'selection_template',
             $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection')
         );
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
     /**
-     * @return string
+     * @codeCoverageIgnore
      */
-    public function getAddButtonHtml()
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_ADD_SELECTION, $this->getButtonAddSelectionBlock());
+        $this->setChild(self::BUTTON_CLOSE_SEARCH, $this->getButtonCloseSearchBlock());
+        $this->setChild(self::BUTTON_OPTION_DELETE, $this->getButtonOptionDeleteBlock());
+    }
+
+    public function getButtonAddSelectionBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setId($this->getFieldId() . '_{{index}}_add_button')
+            ->setLabel(Mage::helper('bundle')->__('Add Selection'))
+            ->setOnClick('bSelection.showSearch(event)');
+    }
+
+    public function getButtonCloseSearchBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonCloseBlock()
+            ->setId($this->getFieldId() . '_{{index}}_close_button')
+            ->setLabel(Mage::helper('bundle')->__('Close'))
+            ->setOnClick('bSelection.closeSearch(event)')
+            ->resetClass()
+            ->setClass(self::BUTTON__CLASS_BACK)
+            ->addClass('no-display');
+    }
+
+    public function getButtonOptionDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->getChildHtml('add_button');
+        return parent::getButtonDeleteBlock()
+            ->setLabel(Mage::helper('catalog')->__('Delete Option'))
+            ->setOnClick('bOption.remove(event)')
+            ->addClass('delete-product-option');
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index 85dc7f915f7..eabe40d772b 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -72,13 +72,11 @@ protected function _beforeToHtml()
      */
     public function getButtonsHtml()
     {
-        $addButtonData = [
-            'id'    => 'add_button_' . $this->getIndex(),
-            'label' => Mage::helper('sales')->__('Add Selected Product(s) to Option'),
-            'onclick' => 'bSelection.productGridAddSelected(event)',
-            'class' => 'add',
-        ];
-        return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+        return parent::getButtonAddBlock()
+            ->setId('add_button_' . $this->getIndex())
+            ->setLabel(Mage::helper('sales')->__('Add Selected Product(s) to Option'))
+            ->setOnClick('bSelection.productGridAddSelected(event)')
+            ->toHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 20cd78554a1..03c30053e37 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -66,18 +66,25 @@ public function getFieldName()
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'selection_delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('catalog')->__('Delete'),
-                    'class' => 'delete icon-btn',
-                    'on_click' => 'bSelection.remove(event)'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_SELECTION_DELETE, $this->getButtonSelectionDeleteBlock());
+    }
+
+    public function getButtonSelectionDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock()
+            ->setOnClick('bSelection.remove(event)')
+            ->addClass('icon-btn');
+    }
+
     /**
      * Retrieve delete button html
      *
diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index 11036daf1ef..f38884c25dc 100644
--- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -56,15 +56,10 @@ public function getHeader()
      */
     public function getSaveButtonHtml()
     {
-        /** @var Mage_Core_Block_Abstract $block */
-        $block = $this->getLayout()->createBlock('adminhtml/widget_button');
-        $block->setData([
-            'label'     => Mage::helper('currencysymbol')->__('Save Currency Symbols'),
-            'onclick'   => 'currencySymbolsForm.submit();',
-            'class'     => 'save'
-        ]);
-
-        return $block->toHtml();
+        return parent::getButtonSaveBlock()
+            ->setLabel(Mage::helper('currencysymbol')->__('Save Currency Symbols'))
+            ->setOnClick('currencySymbolsForm.submit();')
+            ->toHtml();
     }
 
     /**
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 46575233f05..8608c11a77c 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -99,13 +99,14 @@ public function getPurchasedSeparatelySelect()
      */
     public function getAddButtonHtml()
     {
-        $addButton = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label' => Mage::helper('downloadable')->__('Add New Row'),
-                'id'    => 'add_link_item',
-                'class' => 'add'
-            ]);
-        return $addButton->toHtml();
+        return $this->getButtonAddBlock()->toHtml();
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock()
+            ->setId('add_link_item')
+            ->setLabel(Mage::helper('downloadable')->__('Add New Row'));
     }
 
     /**
@@ -248,22 +249,33 @@ public function getConfigMaxDownloads()
     protected function _prepareLayout()
     {
         parent::_prepareLayout();
-        $this->setChild(
-            'upload_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')->addData([
-               'id'      => '',
-               'label'   => Mage::helper('adminhtml')->__('Upload Files'),
-               'type'    => 'button',
-               'onclick' => 'Downloadable.massUploadByType(\'links\');Downloadable.massUploadByType(\'linkssample\')'
-            ])
-        );
+
         $this->_addElementIdsMapping([
            'container' => $this->getHtmlId() . '-new',
            'delete'    => $this->getHtmlId() . '-delete'
         ]);
+
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_UPLOAD, $this->getButtonUploadBlock());
+    }
+
+    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonUploadBlock($name, $attributes)
+            ->addData([
+                'id'      => '',
+                'onclick' => 'Downloadable.massUploadByType(\'links\');Downloadable.massUploadByType(\'linkssample\')'
+            ]);
+    }
+
     /**
      * Retrieve Upload button HTML
      *
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 5234ea895d9..c74090c6279 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -51,13 +51,10 @@ public function isReadonly()
      */
     public function getAddButtonHtml()
     {
-        $addButton = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label' => Mage::helper('downloadable')->__('Add New Row'),
-                'id' => 'add_sample_item',
-                'class' => 'add',
-            ]);
-        return $addButton->toHtml();
+        return parent::getButtonAddBlock()
+            ->setId('add_sample_item')
+            ->setLabel(Mage::helper('downloadable')->__('Add New Row'))
+            ->toHtml();
     }
 
     /**
@@ -131,24 +128,33 @@ public function getSamplesTitle()
     protected function _prepareLayout()
     {
         parent::_prepareLayout();
-        $this->setChild(
-            'upload_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->addData([
-                    'id'      => '',
-                    'label'   => Mage::helper('adminhtml')->__('Upload Files'),
-                    'type'    => 'button',
-                    'onclick' => 'Downloadable.massUploadByType(\'samples\')'
-                ])
-        );
 
         $this->_addElementIdsMapping([
             'container' => $this->getHtmlId() . '-new',
             'delete'    => $this->getHtmlId() . '-delete'
         ]);
+
+        $this->addButtons();
         return $this;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_UPLOAD, $this->getButtonUploadBlock());
+    }
+
+    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonUploadBlock($name, $attributes)
+            ->addData([
+                'id'      => '',
+                'onclick' => 'Downloadable.massUploadByType(\'samples\')'
+            ]);
+    }
+
     /**
      * Retrieve Upload button HTML
      *
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index 3da3b71c1c2..f91e17fc56a 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
@@ -30,27 +30,32 @@ abstract class Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract extends
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('eav')->__('Delete'),
-                    'class' => 'delete delete-option'
-                ])
-        );
-
-        $this->setChild(
-            'add_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData([
-                    'label' => Mage::helper('eav')->__('Add Option'),
-                    'class' => 'add',
-                    'id'    => 'add_new_option_button'
-                ])
-        );
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+        $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
+    }
+
+    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonAddBlock($name, $attributes)
+            ->setId('add_new_option_button')
+            ->setLabel(Mage::helper('eav')->__('Add Option'));
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->addClass('delete-option');
+    }
+
     /**
      * Retrieve HTML of add button
      *
diff --git a/app/code/core/Mage/Uploader/Block/Abstract.php b/app/code/core/Mage/Uploader/Block/Abstract.php
index c4d46a71923..740266e21ee 100644
--- a/app/code/core/Mage/Uploader/Block/Abstract.php
+++ b/app/code/core/Mage/Uploader/Block/Abstract.php
@@ -122,48 +122,54 @@ protected function _addElementIdsMapping($additionalButtons = [])
     }
 
     /**
-     * Prepare layout, create buttons, set front-end elements ids
-     *
-     * @return Mage_Core_Block_Abstract
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {
-        $this->setChild(
-            'browse_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->addData([
-                    // Workaround for IE9
-                    'before_html'   => sprintf(
-                        '<div style="display:inline-block;" id="%s">',
-                        $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX)
-                    ),
-                    'after_html'    => '</div>',
-                    'id'            => $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX . '_button'),
-                    'label'         => Mage::helper('uploader')->__('Browse Files...'),
-                    'type'          => 'button',
-                ])
-        );
-
-        $this->setChild(
-            'delete_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->addData([
-                    'id'      => '{{id}}',
-                    'class'   => 'delete',
-                    'type'    => 'button',
-                    'label'   => Mage::helper('uploader')->__('Remove')
-                ])
-        );
-
         $this->_addElementIdsMapping([
             'container'         => $this->getHtmlId(),
             'templateFile'      => $this->getElementId('template'),
             'browse'            => $this->_prepareElementsIds([self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX])
         ]);
 
+        $this->addButtons();
         return parent::_prepareLayout();
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        $this->setChild(self::BUTTON_BROWSE, $this->getButtonBrowseBlock());
+        $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
+    }
+
+    public function getButtonBrowseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlock($name, $attributes)
+            ->addData([
+                // Workaround for IE9
+                'before_html'   => sprintf(
+                    '<div style="display:inline-block;" id="%s">',
+                    $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX)
+                ),
+                'after_html'    => '</div>',
+                'id'            => $this->getElementId(self::DEFAULT_BROWSE_BUTTON_ID_SUFFIX . '_button'),
+                'label'         => Mage::helper('uploader')->__('Browse Files...'),
+                'type'          => 'button',
+            ]);
+    }
+
+    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonDeleteBlock($name, $attributes)
+            ->setId('{{id}}')
+            ->setLabel(Mage::helper('uploader')->__('Remove'))
+            ->setOnClick('')
+            ->setType('button');
+    }
+
     /**
      * Get browse button html
      *
diff --git a/app/code/core/Mage/Uploader/Block/Multiple.php b/app/code/core/Mage/Uploader/Block/Multiple.php
index 48972c81215..04249e5bcb2 100644
--- a/app/code/core/Mage/Uploader/Block/Multiple.php
+++ b/app/code/core/Mage/Uploader/Block/Multiple.php
@@ -29,20 +29,27 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
 
-        $this->setChild(
-            'upload_button',
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->addData([
-                    'id'      => $this->getElementId(self::DEFAULT_UPLOAD_BUTTON_ID_SUFFIX),
-                    'label'   => Mage::helper('uploader')->__('Upload Files'),
-                    'type'    => 'button',
-                ])
-        );
-
         $this->_addElementIdsMapping([
             'upload' => $this->_prepareElementsIds([self::DEFAULT_UPLOAD_BUTTON_ID_SUFFIX])
         ]);
 
+        $this->addButtons();
         return $this;
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function addButtons(): void
+    {
+        parent::addButtons();
+        $this->setChild(self::BUTTON_UPLOAD, $this->getButtonUploadBlock());
+    }
+
+    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonUploadBlock($name, $attributes)
+            ->setId($this->getElementId(self::DEFAULT_UPLOAD_BUTTON_ID_SUFFIX))
+            ->setType('button');
+    }
 }
diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
index 62ec981fe07..1777e17c408 100644
--- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
@@ -207,12 +207,10 @@ protected function _setAddButton()
     {
         $this->setChild(
             self::BUTTON_ADD,
-            $this->getLayout()->createBlock('adminhtml/widget_button')
-                ->setData(['id' => 'add_tax_' . $this->getElement()->getHtmlId(),
-                'label' => Mage::helper('catalog')->__('Add Tax'),
-                'onclick' => "weeeTaxControl.addItem('" . $this->getElement()->getHtmlId() . "')",
-                'class' => 'add'
-                ])
+            parent::getButtonAddBlock()
+                ->setId('add_tax_' . $this->getElement()->getHtmlId())
+                ->setLabel(Mage::helper('catalog')->__('Add Tax'))
+                ->setOnClick("weeeTaxControl.addItem('" . $this->getElement()->getHtmlId() . "')")
         );
     }
 }
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php
index cd2bcb922e6..37ae1af84af 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -161,12 +161,12 @@ protected function _toHtml()
         }
 
         $buttons = $config->getButtons();
-        $chooseButton = $this->getLayout()->createBlock('adminhtml/widget_button')
+        $chooseButton = parent::getButtonBlock()
             ->setType('button')
             ->setId($chooserId . 'control')
-            ->setClass('btn-chooser')
             ->setLabel($buttons['open'])
-            ->setOnclick($chooserId . '.choose()')
+            ->setOnClick($chooserId . '.choose()')
+            ->addClass('btn-chooser')
             ->setDisabled($element->getReadonly());
         $chooser->setData('after_element_html', $hiddenHtml . $chooseButton->toHtml());
 
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index cf342ac0727..8fcac7e816a 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -248,13 +248,10 @@ public function getLayoutsChooser()
      */
     public function getAddLayoutButtonHtml()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label'     => Mage::helper('widget')->__('Add Layout Update'),
-                'onclick'   => 'WidgetInstance.addPageGroup({})',
-                'class'     => 'add'
-            ]);
-        return $button->toHtml();
+        return parent::getButtonAddBlock()
+            ->setLabel(Mage::helper('widget')->__('Add Layout Update'))
+            ->setOnClick('WidgetInstance.addPageGroup({})')
+            ->toHtml();
     }
 
     /**
@@ -264,13 +261,10 @@ public function getAddLayoutButtonHtml()
      */
     public function getRemoveLayoutButtonHtml()
     {
-        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
-            ->setData([
-                'label'     => $this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Remove Layout Update')),
-                'onclick'   => 'WidgetInstance.removePageGroup(this)',
-                'class'     => 'delete'
-            ]);
-        return $button->toHtml();
+        return parent::getButtonDeleteBlock()
+            ->setLabel($this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Remove Layout Update')))
+            ->setOnClick('WidgetInstance.removePageGroup(this)')
+            ->toHtml();
     }
 
     /**
diff --git a/tests/unit/Mage/Adminhtml/Block/Api/ButtonsTest.php b/tests/unit/Mage/Adminhtml/Block/Api/ButtonsTest.php
new file mode 100644
index 00000000000..b4e19f740c0
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Api/ButtonsTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Api;
+
+use Mage;
+use Mage_Adminhtml_Block_Api_Buttons;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ButtonsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Api_Buttons $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Api_Buttons();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Api_Buttons::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Api_Buttons::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Role', $result->getLabel());
+        $this->assertStringStartsWith('if(confirm(', $result->getOnClick());
+        $this->assertStringEndsWith('); return false;', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Api_Buttons::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.reload()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Api_Buttons::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Role', $result->getLabel());
+        $this->assertSame('roleForm.submit();return false;', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/CacheTest.php b/tests/unit/Mage/Adminhtml/Block/CacheTest.php
index 71908320381..82d7c5ddb71 100644
--- a/tests/unit/Mage/Adminhtml/Block/CacheTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/CacheTest.php
@@ -28,7 +28,6 @@ class CacheTest extends TestCase
     public function setUp(): void
     {
         Mage::app();
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Adminhtml_Block_Cache();
     }
 
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
new file mode 100644
index 00000000000..a2ab3377dee
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Category\Edit;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Category_Edit_Form;
+use Mage_Catalog_Model_Category;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class FormTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Category_Edit_Form $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('category', new Mage_Catalog_Model_Category());
+        Mage::register('current_category', new Mage_Catalog_Model_Category());
+
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Category_Edit_Form();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Category_Edit_Form::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonDeleteBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonDeleteBlock();
+//        $this->assertSame('Delete Category', $result->getLabel());
+//        $this->assertStringStartsWith("categoryDelete('", $result->getOnClick());
+//        $this->assertSame('delete', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Category_Edit_Form::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonDeleteResetBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonResetBlock();
+//        $this->assertSame('Reset', $result->getLabel());
+//        $this->assertStringStartsWith("categoryReset('", $result->getOnClick());
+//        $this->assertSame('', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Category_Edit_Form::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function getButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Category', $result->getLabel());
+        $this->assertStringStartsWith("categorySubmit('", $result->getOnClick());
+        $this->assertStringEndsWith("', true)", $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/TreeTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/TreeTest.php
new file mode 100644
index 00000000000..21a3ff0263a
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/TreeTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Category;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Category_Tree;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class TreeTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Category_Tree $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Category_Tree();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Category_Tree::getButtonAddRootBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddRootBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddRootBlock();
+        $this->assertSame('add_root_category_button', $result->getId());
+        $this->assertSame('Add Root Category', $result->getLabel());
+        $this->assertStringStartsWith("addNew('", $result->getOnClick());
+        $this->assertStringEndsWith("', true)", $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Category_Tree::getButtonAddSubBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddSubBlock();
+        $this->assertSame('add_subcategory_button', $result->getId());
+        $this->assertSame('Add Subcategory', $result->getLabel());
+        $this->assertStringStartsWith("addNew('", $result->getOnClick());
+        $this->assertStringEndsWith("', false)", $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+        $this->assertIsString($result->getStyle());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormattributeTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormattributeTest.php
new file mode 100644
index 00000000000..27df15ab5e4
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormattributeTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class FormattributeTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Attribute', $result->getLabel());
+        $this->assertSame('this.form.submit();', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormgroupTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormgroupTest.php
new file mode 100644
index 00000000000..fbd72ba8723
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/FormgroupTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class FormgroupTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Group', $result->getLabel());
+        $this->assertSame('this.form.submit();', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/MainTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/MainTest.php
new file mode 100644
index 00000000000..b4f0afe2a94
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/MainTest.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main;
+use Mage_Core_Model_Layout;
+use Mage_Eav_Model_Entity_Attribute_Set;
+use PHPUnit\Framework\TestCase;
+
+class MainTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('current_attribute_set', new Mage_Eav_Model_Entity_Attribute_Set());
+
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonAddGroupBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddGroupBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddGroupBlock();
+        $this->assertSame('Add New', $result->getLabel());
+        $this->assertSame('editSet.addGroup();', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Attribute Set', $result->getLabel());
+        $this->assertStringStartsWith("deleteConfirm('All products of this set will be deleted! Are you sure you want to delete this attribute set?'", $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonDeleteGroupBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteGroupBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteGroupBlock();
+        $this->assertSame('Delete Selected Group', $result->getLabel());
+        $this->assertSame('editSet.submit();', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonRenameBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonRenameBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonRenameBlock();
+        $this->assertSame('New Set Name', $result->getLabel());
+        $this->assertSame('editSet.rename()', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.reload()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Attribute Set', $result->getLabel());
+        $this->assertSame('editSet.save();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php
new file mode 100644
index 00000000000..7d90ce01377
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class AddTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add::getButtonSaveGroupBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveGroupBlock();
+        $this->assertSame('Save Attribute Set', $result->getLabel());
+        $this->assertSame('if (addSet.submit()) disableElements(\'save\');', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/MainTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/MainTest.php
new file mode 100644
index 00000000000..d4f1f23505f
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/MainTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class MainTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add New Set', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/_New/Product/CreatedTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/_New/Product/CreatedTest.php
new file mode 100644
index 00000000000..78ef21dbdf8
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Attribute/_New/Product/CreatedTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Attribute\_New\Product;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created;
+use Mage_Catalog_Model_Product;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class CreatedTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('product', new Mage_Catalog_Model_Product());
+
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created::getButtonCloseBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCloseBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCloseBlock();
+        $this->assertSame('Close Window', $result->getLabel());
+        $this->assertSame('addAttribute(true)', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/CreatedTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/CreatedTest.php
new file mode 100644
index 00000000000..d6f11809386
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/CreatedTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Created;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class CreatedTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Created $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Created();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Created::getButtonCloseBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCloseBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCloseBlock();
+        $this->assertSame('Close Window', $result->getLabel());
+        $this->assertSame('addProduct(true)', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Actions/AttributeTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Actions/AttributeTest.php
new file mode 100644
index 00000000000..5f6f6e8ea5d
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Actions/AttributeTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Actions;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class AttributeTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonContinueBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save', $result->getLabel());
+        $this->assertSame('attributesForm.submit()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Bundle/Option/SelectionTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Bundle/Option/SelectionTest.php
new file mode 100644
index 00000000000..fc9b2f9c383
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Bundle/Option/SelectionTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Bundle\Option;
+
+use Mage;
+use Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SelectionTest extends TestCase
+{
+    private static ?Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection::getButtonSelectionDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSelectionDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSelectionDeleteBlock();
+        $this->assertSame('Delete', $result->getLabel());
+        $this->assertSame('bSelection.remove(event)', $result->getOnClick());
+        $this->assertSame('delete icon-btn', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php
new file mode 100644
index 00000000000..c56cfeef6b0
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Options;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class OptionTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Option', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('delete delete-product-option', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php
new file mode 100644
index 00000000000..30b20805ad3
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SelectTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('add_select_row_button_{{option_id}}', $result->getId());
+        $this->assertSame('Add New Row', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('add add-select-row', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('delete_select_row_button', $result->getId());
+        $this->assertSame('Delete Row', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('delete delete-select-row icon-btn', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/OptionsTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/OptionsTest.php
new file mode 100644
index 00000000000..474ea9fc44e
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/OptionsTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class OptionsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('add_new_defined_option', $result->getId());
+        $this->assertSame('Add New Option', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/GroupTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/GroupTest.php
new file mode 100644
index 00000000000..716345e7ab8
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/GroupTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Price;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class GroupTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Group Price', $result->getLabel());
+        $this->assertSame('return groupPriceControl.addItem()', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/TierTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/TierTest.php
new file mode 100644
index 00000000000..da176f9c156
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/TierTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Price;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class TierTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Tier', $result->getLabel());
+        $this->assertSame('return tierPriceControl.addItem()', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+        $this->assertSame('add_tier_price_item_button', $result->getName());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/SettingsTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/SettingsTest.php
new file mode 100644
index 00000000000..4e05ffac7a0
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/SettingsTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SettingsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings::getButtonContinueBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonContinueBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonContinueBlock();
+        $this->assertSame('Continue', $result->getLabel());
+        $this->assertStringStartsWith('setSettings(', $result->getOnClick());
+        $this->assertStringEndsWith("','attribute_set_id','product_type')", $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Settings::getContinueUrl()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetContinueUrl(): void
+    {
+        $this->assertIsString(self::$subject->getContinueUrl());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
new file mode 100644
index 00000000000..750fa46d21b
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ConfigTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config::getButtonCreateEmptyBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonCreateEmptyBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonCreateEmptyBlock();
+//        $this->assertSame('Create Empty', $result->getLabel());
+//        $this->assertSame('superProduct.createEmptyProduct()', $result->getOnClick());
+//        $this->assertSame('add', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config::getButtonCreateFromConfigurableBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonCreateFromConfigurableBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonCreateFromConfigurableBlock();
+//        $this->assertSame('Copy From Configurable', $result->getLabel());
+//        $this->assertSame('superProduct.createNewProduct()', $result->getOnClick());
+//        $this->assertSame('add', $result->getClass());
+//    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php
new file mode 100644
index 00000000000..1c1dadad433
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SettingsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings::getButtonContinueBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCreateFromConfigurableBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonContinueBlock();
+        $this->assertSame('Continue', $result->getLabel());
+        $this->assertStringStartsWith('setSuperSettings(', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/EditTest.php
new file mode 100644
index 00000000000..9e1e7948be5
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/EditTest.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Catalog\Product;
+
+use Mage;
+use Mage_Adminhtml_Block_Catalog_Product_Edit;
+use Mage_Catalog_Model_Product;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('current_product', new Mage_Catalog_Model_Product());
+
+        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonBackPopupBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackPopupBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackPopupBlock();
+        $this->assertSame('Close Window', $result->getLabel());
+        $this->assertSame('window.close()', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete', $result->getLabel());
+        $this->assertStringStartsWith('confirmSetLocation(', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonDuplicateBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDuplicateBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDuplicateBlock();
+        $this->assertSame('Duplicate', $result->getLabel());
+        $this->assertStringStartsWith("confirmSetLocation('Are you sure you want to do this?', ", $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save', $result->getLabel());
+        $this->assertSame('productForm.submit()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Catalog_Product_Edit::getButtonSaveAndContinueBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Catalog
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveAndContinueBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveAndContinueBlock();
+        $this->assertSame('Save and Continue Edit', $result->getLabel());
+        $this->assertStringStartsWith('saveAndContinueEdit(', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
index 34b92b06ec8..5bc0d405503 100644
--- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
@@ -19,18 +19,92 @@
 
 use Mage;
 use Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses;
+use Mage_Core_Model_Layout;
 use Mage_Customer_Model_Customer;
 use PHPUnit\Framework\TestCase;
 
 class AddressesTest extends TestCase
 {
-    public Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses $subject;
+    private static ?Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-        $this->subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses();
+        Mage::register('current_customer', new Mage_Customer_Model_Customer());
+        self::$subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Customer
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('add_address_button', $result->getId());
+        $this->assertSame('Add New Address', $result->getLabel());
+        $this->assertSame('add_address_button', $result->getName());
+        $this->assertSame('add_address_button', $result->getElementName());
+        $this->assertIsBool($result->getDisabled());
+        $this->assertSame('customerAddresses.addNewAddress()', $result->getOnClick());
+        $this->assertStringStartsWith('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::getButtonCancelBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Customer
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCancelBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCancelBlock();
+        $this->assertSame('cancel_add_address_template_', $result->getId());
+        $this->assertSame('Cancel', $result->getLabel());
+        $this->assertSame('cancel_address', $result->getName());
+        $this->assertSame('cancel_address', $result->getElementName());
+        $this->assertIsBool($result->getDisabled());
+        $this->assertSame('customerAddresses.cancelAdd(this)', $result->getOnClick());
+        $this->assertStringStartsWith('cancel delete-address', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Customer
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Address', $result->getLabel());
+        $this->assertSame('delete_address', $result->getName());
+        $this->assertSame('delete_address', $result->getElementName());
+        $this->assertIsBool($result->getDisabled());
+        $this->assertNull($result->getOnClick());
+        $this->assertStringStartsWith('delete', $result->getClass());
     }
 
     /**
@@ -45,7 +119,6 @@ public function testInitForm(): void
 
         $mock
             ->method('getRegistryCurrentCustomer')
-            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
             ->willReturn(new Mage_Customer_Model_Customer());
 
         $mock
diff --git a/tests/unit/Mage/Adminhtml/Block/Newsletter/ProblemTest.php b/tests/unit/Mage/Adminhtml/Block/Newsletter/ProblemTest.php
new file mode 100644
index 00000000000..16f4de23105
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Newsletter/ProblemTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Newsletter;
+
+use Mage;
+use Mage_Adminhtml_Block_Newsletter_Problem;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ProblemTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Newsletter_Problem $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Newsletter_Problem();
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Problem::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Selected Problems', $result->getLabel());
+        $this->assertSame('problemController.deleteSelected();', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Problem::getButtonUnsubscribeBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonUnsubscribeBlock(): void
+    {
+        $result = self::$subject->getButtonUnsubscribeBlock();
+        $this->assertSame('Unsubscribe Selected', $result->getLabel());
+        $this->assertSame('problemController.unsubscribe();', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Problem::getUnsubscribeButtonHtml()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     */
+    public function testGetUnsubscribeButtonHtml(): void
+    {
+        $this->assertIsString(self::$subject->getUnsubscribeButtonHtml());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Problem::getShowButtons()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     */
+    public function testGetShowButtons(): void
+    {
+        $this->assertIsBool(self::$subject->getShowButtons());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
new file mode 100644
index 00000000000..e0ad409884a
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Newsletter\Queue;
+
+use Mage;
+use Mage_Adminhtml_Block_Newsletter_Queue_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Newsletter_Queue_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Newsletter_Queue_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Queue_Edit::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href = ', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Queue_Edit::getButtonPreviewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonPreviewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonPreviewBlock();
+        $this->assertSame('Preview Template', $result->getLabel());
+        $this->assertSame('queueControl.preview();', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Queue_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Newsletter', $result->getLabel());
+        $this->assertSame('queueControl.save()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Queue_Edit::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location = window.location', $result->getOnClick());
+        $this->assertSame('reset', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Queue_Edit::getButtonSaveAndContinueBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveAndContinueBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveAndContinueBlock();
+        $this->assertSame('Save and Resume', $result->getLabel());
+        $this->assertSame('queueControl.resume()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
new file mode 100644
index 00000000000..b6374c7910f
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Newsletter\Template;
+
+use Mage;
+use Mage_Adminhtml_Block_Newsletter_Template_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Newsletter_Template_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Newsletter_Template_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith("window.location.href = '", $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Template', $result->getLabel());
+        $this->assertSame('templateControl.deleteTemplate();', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonPreviewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonPreviewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonPreviewBlock();
+        $this->assertSame('Preview Template', $result->getLabel());
+        $this->assertSame('templateControl.preview();', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.href = window.location.href', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Template', $result->getLabel());
+        $this->assertSame('templateControl.save();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonSaveAsBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveAsBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveAsBlock();
+        $this->assertSame('Save As', $result->getLabel());
+        $this->assertSame('templateControl.saveAs();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonToHtmlBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonToHtmlBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonToHtmlBlock();
+        $this->assertSame('convert_button_back', $result->getId());
+        $this->assertSame('Return HTML Version', $result->getLabel());
+        $this->assertSame('templateControl.unStripTags();', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+        $this->assertSame('display:none', $result->getStyle());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Newsletter_Template_Edit::getButtonToPlainBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Newsletter
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonToPlainBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonToPlainBlock();
+        $this->assertSame('convert_button', $result->getId());
+        $this->assertSame('Convert to Plain Text', $result->getLabel());
+        $this->assertSame('templateControl.stripTags();', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Permissions/ButtonsTest.php b/tests/unit/Mage/Adminhtml/Block/Permissions/ButtonsTest.php
new file mode 100644
index 00000000000..433638a211e
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Permissions/ButtonsTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Permissions;
+
+use Mage;
+use Mage_Adminhtml_Block_Permissions_Buttons;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ButtonsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Permissions_Buttons $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Permissions_Buttons();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Permissions_Buttons::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Permissions
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Permissions_Buttons::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Permissions
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Role', $result->getLabel());
+        $this->assertStringStartsWith('if(confirm(', $result->getOnClick());
+        $this->assertStringEndsWith('); return false;', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Permissions_Buttons::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Permissions
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.reload()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+    /**
+     * @covers Mage_Adminhtml_Block_Permissions_Buttons::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Permissions
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Role', $result->getLabel());
+        $this->assertSame('roleForm.submit();return false;', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Report/GridTest.php b/tests/unit/Mage/Adminhtml/Block/Report/GridTest.php
new file mode 100644
index 00000000000..e920cebca51
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Report/GridTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Report;
+
+use Mage;
+use Mage_Adminhtml_Block_Report_Grid;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class GridTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Report_Grid $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Report_Grid();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Report_Grid::getButtonExportlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Report
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonExportlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonExportlock();
+        $this->assertSame('Export', $result->getLabel());
+        $this->assertStringStartsWith('id_', $result->getOnClick());
+        $this->assertStringEndsWith('.doExport()', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Report_Grid::getButtonResetFilterBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Report
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetFilterBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetFilterBlock();
+        $this->assertSame('Reset Filter', $result->getLabel());
+        $this->assertStringStartsWith('id_', $result->getOnClick());
+        $this->assertStringEndsWith('.resetFilter()', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Report_Grid::getButtonSearchBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Report
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSearchBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSearchBlock();
+        $this->assertSame('Search', $result->getLabel());
+        $this->assertStringStartsWith('id_', $result->getOnClick());
+        $this->assertStringEndsWith('.doFilter()', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Comments/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Comments/ViewTest.php
new file mode 100644
index 00000000000..1f968c1683b
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Comments/ViewTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Sales\Order\Comments;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Comments_View;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ViewTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Comments_View $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Comments_View();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Comments_View::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('submit_comment_button', $result->getId());
+        $this->assertSame('Submit Comment', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/CartTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/CartTest.php
new file mode 100644
index 00000000000..30915eacd04
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/CartTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Sales\Order\Create\Sidebar;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class CartTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Cart::getButtonEmptyCustomerCartBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonEmptyCustomerCartBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonEmptyCustomerCartBlock();
+        $this->assertSame('Clear Shopping Cart', $result->getLabel());
+        $this->assertStringStartsWith('order.clearShoppingCart(', $result->getOnClick());
+        $this->assertNull($result->getClass());
+        $this->assertSame('float: right;', $result->getStyle());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
new file mode 100644
index 00000000000..504b60eadb1
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Sales\Order\Creditmemo\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items;
+use Mage_Core_Model_Layout;
+use Mage_Sales_Model_Order_Creditmemo;
+use PHPUnit\Framework\TestCase;
+
+class ItemsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('current_creditmemo', new Mage_Sales_Model_Order_Creditmemo());
+
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items::getButtonUpdateBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonUpdateBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonUpdateBlock();
+//        $this->assertSame('Update Qty\'s', $result->getLabel());
+//        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
+//        $this->assertSame('update-button', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items::getButtonRefundBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonRefundBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonRefundBlock();
+//        $this->assertSame('Update Qty\'s', $result->getLabel());
+//        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
+//        $this->assertSame('update-button', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items::getButtonRefundOfflineBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function getButtonRefundOfflineBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonRefundOfflineBlock();
+//        $this->assertSame('Update Qty\'s', $result->getLabel());
+//        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
+//        $this->assertSame('update-button', $result->getClass());
+//    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
new file mode 100644
index 00000000000..765f96b18d5
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Sales\Order\Invoice\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class Tracking extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Tracking Number', $result->getLabel());
+        $this->assertSame('trackingControl.add()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/View/HistoryTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/View/HistoryTest.php
new file mode 100644
index 00000000000..b8192cbb09c
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/View/HistoryTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Sales\View;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_View_History;
+use Mage_Core_Model_Layout;
+use Mage_Sales_Model_Order;
+use PHPUnit\Framework\TestCase;
+
+class HistoryTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_View_History $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('sales_order', new Mage_Sales_Model_Order());
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_View_History();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_View_History::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Submit Comment', $result->getLabel());
+        $this->assertStringStartsWith("submitAndReloadArea($('order_history_block').parentNode", $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/EditTest.php
new file mode 100644
index 00000000000..162d2f8572a
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/EditTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Cache;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Cache_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Cache_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Cache_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Cache_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Cache Settings', $result->getLabel());
+        $this->assertSame('configForm.submit()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/EditTest.php
new file mode 100644
index 00000000000..d2feb4a334d
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Config/EditTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Config;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Config_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Config_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Config_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Config', $result->getLabel());
+        $this->assertSame('configForm.submit()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/TabsTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/TabsTest.php
new file mode 100644
index 00000000000..428e1a6ed95
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Config/TabsTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Config;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Config_Tabs;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class TabsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Config_Tabs $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Config_Tabs();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonDeleteStoreViewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteStoreViewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteStoreViewBlock();
+        $this->assertSame('Delete Store View', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonEditStoreViewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonEditStoreViewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonEditStoreViewBlock();
+        $this->assertSame('Edit Store View', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonNewStoreViewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonNewStoreViewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonNewStoreViewBlock();
+        $this->assertSame('New Store View', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonDeleteWebsiteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteWebsiteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteWebsiteBlock();
+        $this->assertSame('Delete Website', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonEditWebsiteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonEditWebsiteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonEditWebsiteBlock();
+        $this->assertSame('Edit Website', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Config_Tabs::getButtonNewWebsiteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonNewWebsiteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonNewWebsiteBlock();
+        $this->assertSame('New Website', $result->getLabel());
+        $this->assertStringStartsWith('location.href=', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/CurrencyTest.php b/tests/unit/Mage/Adminhtml/Block/System/CurrencyTest.php
new file mode 100644
index 00000000000..974894fb01e
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/CurrencyTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Currency;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class CurrencyTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Currency $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Currency();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Currency::getButtonImportBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonContinueBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonImportBlock();
+        $this->assertSame('Import', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+        $this->assertSame('submit', $result->getType());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Currency::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('document.location.reload()', $result->getOnClick());
+        $this->assertSame('reset', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Currency::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Currency Rates', $result->getLabel());
+        $this->assertSame('currencyForm.submit();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Design/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Design/EditTest.php
new file mode 100644
index 00000000000..ebdb9466ec8
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Design/EditTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Design;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Design_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+use Varien_Object;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Design_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('design', new Varien_Object());
+        self::$subject = new Mage_Adminhtml_Block_System_Design_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Design_Edit::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Design_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save', $result->getLabel());
+        $this->assertSame('designForm.submit()', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Design_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/DesignTest.php b/tests/unit/Mage/Adminhtml/Block/System/DesignTest.php
new file mode 100644
index 00000000000..67d2fef466d
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/DesignTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Design;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class DesignTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Design $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Design();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Design::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Design Change', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Email/Template/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Email/Template/EditTest.php
new file mode 100644
index 00000000000..87550afff77
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Email/Template/EditTest.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Email\Template;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Email_Template_Edit;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Email_Template_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Email_Template_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Template', $result->getLabel());
+        $this->assertSame('templateControl.deleteTemplate();', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonLoadBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonLoadBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonLoadBlock();
+        $this->assertSame('Load Template', $result->getLabel());
+        $this->assertSame('templateControl.load();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+        $this->assertSame('button', $result->getType());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.href = window.location.href', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonPreviewBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonPreviewBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonPreviewBlock();
+        $this->assertSame('Preview Template', $result->getLabel());
+        $this->assertSame('templateControl.preview();', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Template', $result->getLabel());
+        $this->assertSame('templateControl.save();', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonToggleBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonToggleBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonToggleBlock();
+        $this->assertSame('toggle_button', $result->getId());
+        $this->assertSame('Toggle Editor', $result->getLabel());
+        $this->assertSame('templateControl.toggleEditor();', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonToHtmllock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonToHtmllock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonToHtmllock();
+        $this->assertSame('convert_button_back', $result->getId());
+        $this->assertSame('Return Html Version', $result->getLabel());
+        $this->assertSame('templateControl.unStripTags();', $result->getOnClick());
+        $this->assertNull($result->getClass());
+        $this->assertSame('display:none', $result->getStyle());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template_Edit::getButtonToPlainBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonToPlainBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonToPlainBlock();
+        $this->assertSame('convert_button', $result->getId());
+        $this->assertSame('Convert to Plain Text', $result->getLabel());
+        $this->assertSame('templateControl.stripTags();', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Email/TemplateTest.php b/tests/unit/Mage/Adminhtml/Block/System/Email/TemplateTest.php
new file mode 100644
index 00000000000..f2fa3f23183
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Email/TemplateTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Email;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Email_Template;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class TemplateTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Email_Template $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Email_Template();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Email_Template::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add New Template', $result->getLabel());
+        $this->assertStringStartsWith('window.location=', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/GroupTest.php b/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/GroupTest.php
new file mode 100644
index 00000000000..4ff4981e080
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/GroupTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Store\Delete;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Store_Delete_Group;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class GroupTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Store_Delete_Group $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Store_Delete_Group();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Group::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Group::getButtonCancelBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCancelBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCancelBlock();
+        $this->assertSame('Cancel', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Group::getButtonConfirmDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonConfirmDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonConfirmDeleteBlock();
+        $this->assertSame('Delete Store', $result->getLabel());
+        $this->assertSame('deleteForm.submit()', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/WebsiteTest.php b/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/WebsiteTest.php
new file mode 100644
index 00000000000..fb9f9868568
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Store/Delete/WebsiteTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Store\Delete;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Store_Delete_Website;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class WebsiteTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_System_Store_Delete_Website $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_System_Store_Delete_Website();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Website::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Website::getButtonCancelBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCancelBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCancelBlock();
+        $this->assertSame('Cancel', $result->getLabel());
+        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_System_Store_Delete_Website::getButtonConfirmDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_System
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonConfirmDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Website', $result->getLabel());
+        $this->assertSame('deleteForm.submit()', $result->getOnClick());
+        $this->assertSame('cancel', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
new file mode 100644
index 00000000000..b1c9d1c5f1c
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rat\Toolbar;
+
+use Mage;
+use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class AddTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Tax
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add New Tax Rate', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
new file mode 100644
index 00000000000..6d140ecd0fc
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rat\Toolbar;
+
+use Mage;
+use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SaveTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonBackBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Tax
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonBackBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonBackBlock();
+//        $this->assertSame('Back', $result->getLabel());
+//        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+//        $this->assertSame('back', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Tax
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonDeleteBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonDeleteBlock();
+//        $this->assertSame('Delete Rate', $result->getLabel());
+//        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
+//        $this->assertSame('delete', $result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Tax
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonResetBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonResetBlock();
+//        $this->assertSame('Reset', $result->getLabel());
+//        $this->assertSame('window.location.reload()', $result->getOnClick());
+//        $this->assertNull($result->getClass());
+//    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Tax
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonSaveBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonSaveBlock();
+//        $this->assertSame('Save Rate', $result->getLabel());
+//        $this->assertSame('window.location.reload()', $result->getOnClick());
+//        $this->assertSame('save', $result->getClass());
+//    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php
index ea770f2e441..61607e264b2 100644
--- a/tests/unit/Mage/Adminhtml/Block/TemplateTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/TemplateTest.php
@@ -29,7 +29,6 @@ class TemplateTest extends TestCase
     public function setUp(): void
     {
         Mage::app();
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Adminhtml_Block_Template();
     }
 
diff --git a/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
new file mode 100644
index 00000000000..8f00ec48552
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Urlrewrite;
+
+use Mage;
+use Mage_Adminhtml_Block_Urlrewrite_Edit;
+use Mage_Catalog_Model_Category;
+use Mage_Catalog_Model_Product;
+use Mage_Core_Model_Layout;
+use Mage_Core_Model_Url_Rewrite;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Urlrewrite_Edit $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+
+        if (!Mage::registry('current_product')) {
+            Mage::register('current_product', new Mage_Catalog_Model_Product());
+        }
+        Mage::register('current_category', new Mage_Catalog_Model_Category());
+        Mage::register('current_urlrewrite', new Mage_Core_Model_Url_Rewrite());
+
+        self::$subject = new Mage_Adminhtml_Block_Urlrewrite_Edit();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Urlrewrite_Edit::getButtonSkipCategoriesBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSkipCategoriesBlock();
+        $this->assertSame('Skip Category Selection', $result->getLabel());
+        $this->assertStringStartsWith('window.location = \'', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+        $this->assertSame(-1, $result->getLevel());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/Form/Element/GalleryTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/Form/Element/GalleryTest.php
new file mode 100644
index 00000000000..d6fd58ecccb
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Widget/Form/Element/GalleryTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Widget\Form\Element;
+
+use Mage;
+use Mage_Adminhtml_Block_Widget_Form_Element_Gallery;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class GalleryTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Widget_Form_Element_Gallery $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Widget_Form_Element_Gallery();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Widget_Form_Element_Gallery::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add New Image', $result->getLabel());
+        $this->assertSame('addNewImage()', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Widget_Form_Element_Gallery::getButtonDeleteBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete', $result->getLabel());
+        $this->assertSame('deleteImage(#image#)', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php
index 2be3fd4f0a1..8ebf2d38de3 100644
--- a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php
@@ -20,17 +20,79 @@
 use Generator;
 use Mage;
 use Mage_Adminhtml_Block_Widget_Grid;
+use Mage_Core_Model_Layout;
 use PHPUnit\Framework\TestCase;
 
 class GridTest extends TestCase
 {
-    public Mage_Adminhtml_Block_Widget_Grid $subject;
+    private static ?Mage_Adminhtml_Block_Widget_Grid $subject;
 
-    public function setUp(): void
+    public static function setUpBeforeClass(): void
     {
         Mage::app();
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-        $this->subject = new Mage_Adminhtml_Block_Widget_Grid();
+        self::$subject = new Mage_Adminhtml_Block_Widget_Grid();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Widget_Grid::getButtonExportlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Widget
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonExportlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonExportlock();
+        $this->assertSame('Export', $result->getLabel());
+        $this->assertStringEndsWith('.doExport()', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Widget_Grid::getButtonResetFilterBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Widget
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetFilterBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetFilterBlock();
+        $this->assertSame('Reset Filter', $result->getLabel());
+        $this->assertStringEndsWith('.resetFilter()', $result->getOnClick());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Widget_Grid::getButtonSearchBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Widget
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSearchBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSearchBlock();
+        $this->assertSame('Search', $result->getLabel());
+        $this->assertStringEndsWith('.doFilter()', $result->getOnClick());
+        $this->assertSame('task', $result->getClass());
     }
 
     /**
@@ -40,7 +102,7 @@ public function setUp(): void
      */
     public function testAddColumnDefaultData(array $expectedResult, array $column): void
     {
-        $this->assertSame($expectedResult, $this->subject->addColumnDefaultData($column));
+        $this->assertSame($expectedResult, self::$subject->addColumnDefaultData($column));
     }
 
     public function provideAddColumnDefaultData(): Generator
diff --git a/tests/unit/Mage/Api2/Block/Adminhtml/Attribute/ButtonsTest.php b/tests/unit/Mage/Api2/Block/Adminhtml/Attribute/ButtonsTest.php
new file mode 100644
index 00000000000..fa2eeefd9f9
--- /dev/null
+++ b/tests/unit/Mage/Api2/Block/Adminhtml/Attribute/ButtonsTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Api2\Block\Adminhtml\Attribute;
+
+use Mage;
+use Mage_Api2_Block_Adminhtml_Attribute_Buttons;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ButtonsTest extends TestCase
+{
+    private static ?Mage_Api2_Block_Adminhtml_Attribute_Buttons $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Api2_Block_Adminhtml_Attribute_Buttons();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Attribute_Buttons::getButtonBackBlock()
+     * @group Mage_Api2
+     * @group Mage_Api2_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Attribute_Buttons::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save', $result->getLabel());
+        $this->assertSame('form.submit(); return false;', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Api2/Block/Adminhtml/Roles/ButtonsTest.php b/tests/unit/Mage/Api2/Block/Adminhtml/Roles/ButtonsTest.php
new file mode 100644
index 00000000000..b1f856875a2
--- /dev/null
+++ b/tests/unit/Mage/Api2/Block/Adminhtml/Roles/ButtonsTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Api2\Block\Adminhtml\Roles;
+
+use Mage;
+use Mage_Api2_Block_Adminhtml_Roles_Buttons;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ButtonsTest extends TestCase
+{
+    private static ?Mage_Api2_Block_Adminhtml_Roles_Buttons $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Api2_Block_Adminhtml_Roles_Buttons();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Roles_Buttons::getButtonBackBlock()
+     * @group Mage_Api2
+     * @group Mage_Api2_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonBackBlock();
+        $this->assertSame('Back', $result->getLabel());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
+        $this->assertSame('back', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Roles_Buttons::getButtonDeleteBlock())
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonDeleteBlock();
+        $this->assertSame('Delete Role', $result->getLabel());
+        //roleId is not set at this moment, so we set script later
+        $this->assertSame('window.location.reload()', $result->getOnClick());
+        $this->assertSame('delete', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Roles_Buttons::getButtonResetBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonResetBlock();
+        $this->assertSame('Reset', $result->getLabel());
+        $this->assertSame('window.location.reload()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Api2_Block_Adminhtml_Roles_Buttons::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Api
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Role', $result->getLabel());
+        $this->assertSame('roleForm.submit(); return false;', $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/BundleTest.php b/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/BundleTest.php
new file mode 100644
index 00000000000..d6979ab3b9a
--- /dev/null
+++ b/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/BundleTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Bundle\Block\Adminhtm\Catalog\Product\Edit\Tab;
+
+use Mage;
+use Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class BundleTest extends TestCase
+{
+    private static ?Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle::getButtonAddBlock()
+     * @group Mage_Bundle
+     * @group Mage_Bundle_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('add_new_option', $result->getId());
+        $this->assertSame('Add New Option', $result->getLabel());
+        $this->assertSame('bOption.add();', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/Option/OptionTest.php b/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/Option/OptionTest.php
new file mode 100644
index 00000000000..1613795ca90
--- /dev/null
+++ b/tests/unit/Mage/Bundle/Block/Adminhtm/Catalog/Product/Edit/Tab/Option/OptionTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Bundle\Block\Adminhtm\Catalog\Product\Edit\Tab\Option;
+
+use Mage;
+use Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class OptionTest extends TestCase
+{
+    private static ?Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option::getButtonAddSelectionBlock()
+     * @group Mage_Bundle
+     * @group Mage_Bundle_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddSelectionBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddSelectionBlock();
+        $this->assertSame('bundle_option_{{index}}_add_button', $result->getId());
+        $this->assertSame('Add Selection', $result->getLabel());
+        $this->assertSame('bSelection.showSearch(event)', $result->getOnClick());
+        $this->assertSame('add', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option::getButtonCloseSearchBlock()
+     * @group Mage_Bundle
+     * @group Mage_Bundle_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonCloseSearchBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonCloseSearchBlock();
+        $this->assertSame('bundle_option_{{index}}_close_button', $result->getId());
+        $this->assertSame('Close', $result->getLabel());
+        $this->assertSame('bSelection.closeSearch(event)', $result->getOnClick());
+        $this->assertSame('back no-display', $result->getClass());
+    }
+
+    /**
+     * @covers Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option::getButtonOptionDeleteBlock()
+     * @group Mage_Bundle
+     * @group Mage_Bundle_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonOptionDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonOptionDeleteBlock();
+        $this->assertSame('Delete Option', $result->getLabel());
+        $this->assertSame('bOption.remove(event)', $result->getOnClick());
+        $this->assertSame('delete delete-product-option', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
new file mode 100644
index 00000000000..de0cccfd2f3
--- /dev/null
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
+
+use Mage;
+use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class LinksTest extends TestCase
+{
+    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links $subject;
+
+//    public static function setUpBeforeClass(): void
+//    {
+//        Mage::app();
+//        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links();
+//    }
+
+//    public static function tearDownAfterClass(): void
+//    {
+//        self::$subject = null;
+//    }
+
+    /**
+     * @covers Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links::getButtonAddBlock()
+     * @group Mage_Downloadable
+     * @group Mage_Downloadable_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonAddBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonAddBlock();
+//        $this->assertSame('add_link_item', $result->getId());
+//        $this->assertSame('Add New Row', $result->getLabel());
+//        $this->assertNull($result->getOnClick());
+//        $this->assertSame('add', $result->getClass());
+//    }
+}
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
new file mode 100644
index 00000000000..b79762bee44
--- /dev/null
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
+
+use Mage;
+use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SamplesTest extends TestCase
+{
+    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples::getButtonUploadBlock()
+     * @group Mage_Downloadable
+     * @group Mage_Downloadable_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+//    public function testGetButtonUploadBlock(): void
+//    {
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
+//        $result = self::$subject->getButtonUploadBlock();
+//        $this->assertSame('', $result->getId());
+//        $this->assertSame('Upload Files', $result->getLabel());
+//        $this->assertSame('Downloadable.massUploadByType(\'samples\')', $result->getOnClick());
+//        $this->assertNull($result->getClass());
+//        $this->assertSame('button', $result->getType());
+//    }
+}
diff --git a/tests/unit/Mage/Sales/Block/Invoice/Create/ItemsTest.php b/tests/unit/Mage/Sales/Block/Invoice/Create/ItemsTest.php
new file mode 100644
index 00000000000..b2d2662c1bb
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/Invoice/Create/ItemsTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\Invoice\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items;
+use Mage_Core_Model_Layout;
+use Mage_Sales_Model_Order_Invoice;
+use PHPUnit\Framework\TestCase;
+
+class ItemsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('current_invoice', new Mage_Sales_Model_Order_Invoice());
+
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items::getButtonSubmitBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSubmitBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSubmitBlock();
+        $this->assertStringStartsWith('Submit Invoice', $result->getLabel());
+        $this->assertSame('disableElements(\'submit-button\');$(\'edit_form\').submit()', $result->getOnClick());
+        $this->assertStringStartsWith('save submit-button', $result->getClass());
+        $this->assertIsBool($result->getDisabled());
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items::getButtonUpdateBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonUpdateBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonUpdateBlock();
+        $this->assertSame('Update Qty\'s', $result->getLabel());
+        $this->assertStringStartsWith("submitAndReloadArea($('invoice_item_container'),'", $result->getOnClick());
+        $this->assertSame('update-button', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Sales/Block/Order/Create/SidebarTest.php b/tests/unit/Mage/Sales/Block/Order/Create/SidebarTest.php
new file mode 100644
index 00000000000..4824edf6169
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/Order/Create/SidebarTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\Order\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Create_Sidebar;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class SidebarTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Create_Sidebar $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Create_Sidebar();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Create_Sidebar::getButtonTopBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonTopBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonTopBlock();
+        $this->assertSame('Update Changes', $result->getLabel());
+        $this->assertSame('order.sidebarApplyChanges()', $result->getOnClick());
+        $this->assertNull($result->getClass());
+        $this->assertSame('<div class="sub-btn-set">', $result->getBeforeHtml());
+        $this->assertSame('</div>', $result->getAfterHtml());
+    }
+}
diff --git a/tests/unit/Mage/Sales/Block/Order/Shipment/Create/ItemsTest.php b/tests/unit/Mage/Sales/Block/Order/Shipment/Create/ItemsTest.php
new file mode 100644
index 00000000000..6d6761e37bb
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/Order/Shipment/Create/ItemsTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\Order\Shipment\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class ItemsTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items::getButtonSubmitBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSubmitBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSubmitBlock();
+        $this->assertSame('Submit Shipment', $result->getLabel());
+        $this->assertSame('submitShipment(this);', $result->getOnClick());
+        $this->assertSame('save submit-button', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Sales/Block/Order/Shipment/Create/TrackingTest.php b/tests/unit/Mage/Sales/Block/Order/Shipment/Create/TrackingTest.php
new file mode 100644
index 00000000000..4b244ae4258
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/Order/Shipment/Create/TrackingTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\Order\Shipment\Create;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class TrackingTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Tracking::getButtonAddBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonAddBlock();
+        $this->assertSame('Add Tracking Number', $result->getLabel());
+        $this->assertSame('trackingControl.add()', $result->getOnClick());
+        $this->assertSame('', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Sales/Block/Order/Shipment/View/TrackingTest.php b/tests/unit/Mage/Sales/Block/Order/Shipment/View/TrackingTest.php
new file mode 100644
index 00000000000..a49b7ef2277
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/Order/Shipment/View/TrackingTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\Order\Shipment\View;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking;
+use Mage_Core_Model_Layout;
+use Mage_Sales_Model_Order_Shipment;
+use PHPUnit\Framework\TestCase;
+
+class TrackingTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        Mage::register('current_shipment', new Mage_Sales_Model_Order_Shipment());
+
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_Shipment_View_Tracking::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Add', $result->getLabel());
+        $this->assertStringStartsWith("submitAndReloadArea($('shipment_tracking_info').parentNode, '", $result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Sales/Block/View/GiftmessageTest.php b/tests/unit/Mage/Sales/Block/View/GiftmessageTest.php
new file mode 100644
index 00000000000..2a8ac47b757
--- /dev/null
+++ b/tests/unit/Mage/Sales/Block/View/GiftmessageTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sales\Block\View;
+
+use Mage;
+use Mage_Adminhtml_Block_Sales_Order_View_Giftmessage;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class GiftmessageTest extends TestCase
+{
+    private static ?Mage_Adminhtml_Block_Sales_Order_View_Giftmessage $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Adminhtml_Block_Sales_Order_View_Giftmessage();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @covers Mage_Adminhtml_Block_Sales_Order_View_Giftmessage::getButtonSaveBlock()
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group Mage_Adminhtml_Block_Sales
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonSaveBlock();
+        $this->assertSame('Save Gift Message', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('save', $result->getClass());
+    }
+}
diff --git a/tests/unit/Mage/Uploader/Block/AbstractTest.php b/tests/unit/Mage/Uploader/Block/AbstractTest.php
index c2295e61356..b371b580af3 100644
--- a/tests/unit/Mage/Uploader/Block/AbstractTest.php
+++ b/tests/unit/Mage/Uploader/Block/AbstractTest.php
@@ -18,6 +18,7 @@
 namespace OpenMage\Tests\Unit\Mage\Uploader\Block;
 
 use Mage;
+use Mage_Core_Model_Layout;
 use Mage_Uploader_Block_Abstract;
 use Mage_Uploader_Model_Config_Browsebutton;
 use Mage_Uploader_Model_Config_Misc;
@@ -34,6 +35,46 @@ public function setUp(): void
         $this->subject = $this->getMockForAbstractClass(Mage_Uploader_Block_Abstract::class);
     }
 
+    /**
+     * @covers Mage_Uploader_Block_Abstract::getButtonBrowseBlock()
+     * @group Mage_Uploader
+     * @group Mage_Uploader_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonBrowseBlock(): void
+    {
+        $this->subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = $this->subject->getButtonBrowseBlock();
+        $this->assertStringStartsWith('id_', $result->getId());
+        $this->assertSame('Browse Files...', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('button', $result->getType());
+        $this->assertNull($result->getClass());
+    }
+
+    /**
+     * @covers Mage_Uploader_Block_Abstract::getButtonDeleteBlock()
+     * @group Mage_Uploader
+     * @group Mage_Uploader_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonDeleteBlock(): void
+    {
+        $this->subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = $this->subject->getButtonDeleteBlock();
+        $this->assertSame('{{id}}', $result->getId());
+        $this->assertSame('Remove', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('button', $result->getType());
+        $this->assertSame('delete', $result->getClass());
+    }
+
     /**
      * @group Mage_Uploader
      * @group Mage_Uploader_Block
diff --git a/tests/unit/Mage/Uploader/Block/MultipleTest.php b/tests/unit/Mage/Uploader/Block/MultipleTest.php
new file mode 100644
index 00000000000..0cd1e2f0e0e
--- /dev/null
+++ b/tests/unit/Mage/Uploader/Block/MultipleTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Uploader\Block;
+
+use Mage;
+use Mage_Uploader_Block_Multiple;
+use Mage_Core_Model_Layout;
+use PHPUnit\Framework\TestCase;
+
+class MultipleTest extends TestCase
+{
+    private static ?Mage_Uploader_Block_Multiple $subject;
+
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Uploader_Block_Multiple();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
+
+    /**
+     * @group Mage_Uploader
+     * @group Mage_Uploader_Block
+     * @group AdminhtmlButtons
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetButtonUploadBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+
+        $result = self::$subject->getButtonUploadBlock();
+        $this->assertStringStartsWith('id_', $result->getId());
+        $this->assertSame('Upload Files', $result->getLabel());
+        $this->assertNull($result->getOnClick());
+        $this->assertSame('button', $result->getType());
+        $this->assertNull($result->getClass());
+    }
+}

From c03d4a4fe0ed1feb6044e2232e57214ddcb16cb4 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 06:43:48 +0100
Subject: [PATCH 04/10] FIX: need to change methode name b/c parameter
 conflicts with parent method

---
 .../default/default/template/widget/form/element/gallery.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
index a2baa9a2de1..1e97c3896e6 100644
--- a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
@@ -46,7 +46,7 @@
             <input type="file" name="<?php echo $this->getElement()->getName() ?>_<?php echo $type ?>[<?php echo $image->getValueId() ?>]" size="1"></td>
         <?php endforeach ?>
         <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?php echo $this->getElement()->getParentName() ?>[position][<?php echo $image->getValueId() ?>]" value="<?php echo $image->getPosition() ?>" id="<?php echo $this->getElement()->getHtmlId() ?>_position_<?php echo $image->getValueId() ?>" size="3"/></td>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><?php echo $this->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?php echo $this->getElement()->getParentName() ?>[delete][<?php echo $image->getValueId() ?>]" id="<?php echo $this->getElement()->getHtmlId() ?>_delete_<?php echo $image->getValueId() ?>"/></td>
+        <td class="gallery" align="center" style="vertical-align:bottom;"><?php echo $this->getDeleteImageButtonHtml($image->getValueId()) ?><input type="hidden" name="<?php echo $this->getElement()->getParentName() ?>[delete][<?php echo $image->getValueId() ?>]" id="<?php echo $this->getElement()->getHtmlId() ?>_delete_<?php echo $image->getValueId() ?>"/></td>
         </tr>
     <?php endforeach ?>
 <?php endif ?>

From 8c2191458cf777bbc09fc51cff55294b26680ca5 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 07:33:07 +0100
Subject: [PATCH 05/10] phpstan

---
 .phpstan.dist.baseline.neon                   | 35 --------------
 .../core/Mage/Adminhtml/Block/Template.php    | 27 ++++++++---
 .../Product/Edit/Tab/Super/ConfigTest.php     | 22 +++++----
 .../Order/Creditmemo/Create/ItemsTest.php     | 33 +++++++------
 .../Block/Tax/Rate/Toolbar/AddTest.php        |  2 +-
 .../Block/Tax/Rate/Toolbar/SaveTest.php       | 46 ++++++++++---------
 .../Edit/Tab/Downloadable/LinksTest.php       | 29 ++++++------
 .../Edit/Tab/Downloadable/SamplesTest.php     | 11 +++--
 8 files changed, 98 insertions(+), 107 deletions(-)

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index 52b6b6edb73..f33466fe618 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -180,16 +180,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Report/Grid.php
 
-		-
-			message: "#^Parameter \\#1 \\$from of method Mage_Reports_Model_Resource_Report_Collection\\:\\:setInterval\\(\\) expects int, Zend_Date given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Report/Grid.php
-
-		-
-			message: "#^Parameter \\#2 \\$to of method Mage_Reports_Model_Resource_Report_Collection\\:\\:setInterval\\(\\) expects int, Zend_Date given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Report/Grid.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:getCollection\\(\\) should return Mage_Core_Model_Resource_Db_Collection_Abstract\\|Mage_Reports_Model_Grouped_Collection but returns Varien_Data_Collection_Db\\|null\\.$#"
 			count: 1
@@ -485,11 +475,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Container\\:\\:_addButtonChildBlock\\(\\) should return Mage_Adminhtml_Block_Widget_Button but returns Mage_Core_Block_Abstract\\|false\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Widget/Container.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#"
 			count: 2
@@ -4525,16 +4510,6 @@ parameters:
 			count: 4
 			path: app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
 
-		-
-			message: "#^Property Mage_Reports_Model_Resource_Report_Collection\\:\\:\\$_from \\(string\\) does not accept int\\.$#"
-			count: 1
-			path: app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
-
-		-
-			message: "#^Property Mage_Reports_Model_Resource_Report_Collection\\:\\:\\$_to \\(string\\) does not accept int\\.$#"
-			count: 1
-			path: app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
-
 		-
 			message: "#^Comparison operation \"\\!\\=\" between array\\|int and 0 results in an error\\.$#"
 			count: 1
@@ -5795,11 +5770,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
 
-		-
-			message: "#^Variable \\$productsOptions might not be defined\\.$#"
-			count: 1
-			path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
-
 		-
 			message: "#^Cannot call method toOptionArray\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#"
 			count: 1
@@ -6670,11 +6640,6 @@ parameters:
 			count: 1
 			path: app/design/adminhtml/default/default/template/widget/form/element.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 23
-			path: app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:getEmptyCellColspan\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index 8acc02ae04f..eb508e83beb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -167,7 +167,6 @@ private function createWidgetDeleteButtonBlock(string $name = '', array $attribu
     {
         return $this->createWidgetButtonBlock($name, $attributes)
             ->setLabel(Mage::helper('adminhtml')->__('Delete'))
-            #->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()))
             ->setClass(self::BUTTON__CLASS_DELETE);
     }
 
@@ -248,15 +247,31 @@ public function getButtonUpdateBlock(string $name = '', array $attributes = []):
         return $this->createWidgetUpdateButtonBlock($name, $attributes);
     }
 
-    private function createWidgetUploadButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    /**
+     * @param self::BUTTON_* $type
+     */
+    private function createWidgetButtonBlockByType(string $type, string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Upload Files'));
+        $button = $this->createWidgetButtonBlock($name, $attributes);
+
+        switch ($type) {
+            case self::BUTTON_UPDATE:
+                $button->setClass(self::BUTTON__CLASS_UPDATE);
+                break;
+            case self::BUTTON_UPLOAD:
+                $button->setLabel(Mage::helper('adminhtml')->__('Upload Files'));
+                break;
+        }
+
+        return $button;
     }
 
-    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    /**
+     * @param self::BUTTON_* $type
+     */
+    public function getButtonBlockByType(string $type, string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
-        return $this->createWidgetUploadButtonBlock($name, $attributes);
+        return $this->createWidgetButtonBlockByType($type, $name, $attributes);
     }
 
     /**
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
index 750fa46d21b..1d1cc9c2ae8 100644
--- a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
@@ -46,15 +46,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonCreateEmptyBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonCreateEmptyBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonCreateEmptyBlock();
 //        $this->assertSame('Create Empty', $result->getLabel());
 //        $this->assertSame('superProduct.createEmptyProduct()', $result->getOnClick());
 //        $this->assertSame('add', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config::getButtonCreateFromConfigurableBlock()
@@ -65,13 +66,14 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonCreateFromConfigurableBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonCreateFromConfigurableBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonCreateFromConfigurableBlock();
 //        $this->assertSame('Copy From Configurable', $result->getLabel());
 //        $this->assertSame('superProduct.createNewProduct()', $result->getOnClick());
 //        $this->assertSame('add', $result->getClass());
-//    }
+    }
 }
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
index 504b60eadb1..f03afe64a1e 100644
--- a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
@@ -49,15 +49,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonUpdateBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonUpdateBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonUpdateBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
 //        $this->assertSame('update-button', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items::getButtonRefundBlock()
@@ -68,15 +69,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonRefundBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonRefundBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonRefundBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
 //        $this->assertSame('update-button', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items::getButtonRefundOfflineBlock()
@@ -87,13 +89,14 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function getButtonRefundOfflineBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function getButtonRefundOfflineBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonRefundOfflineBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
 //        $this->assertSame('update-button', $result->getClass());
-//    }
+    }
 }
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
index b1c9d1c5f1c..5a98950c7b6 100644
--- a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/AddTest.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rat\Toolbar;
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rate\Toolbar;
 
 use Mage;
 use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add;
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
index 6d140ecd0fc..fb13d6d6f5f 100644
--- a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rat\Toolbar;
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Tax\Rate\Toolbar;
 
 use Mage;
 use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save;
@@ -46,15 +46,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonBackBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonBackBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonBackBlock();
 //        $this->assertSame('Back', $result->getLabel());
 //        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
 //        $this->assertSame('back', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonDeleteBlock()
@@ -65,15 +66,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonDeleteBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonDeleteBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonDeleteBlock();
 //        $this->assertSame('Delete Rate', $result->getLabel());
 //        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
 //        $this->assertSame('delete', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonResetBlock()
@@ -84,15 +86,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonResetBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonResetBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonResetBlock();
 //        $this->assertSame('Reset', $result->getLabel());
 //        $this->assertSame('window.location.reload()', $result->getOnClick());
 //        $this->assertNull($result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::getButtonSaveBlock()
@@ -103,13 +106,14 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonSaveBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonSaveBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonSaveBlock();
 //        $this->assertSame('Save Rate', $result->getLabel());
 //        $this->assertSame('window.location.reload()', $result->getOnClick());
 //        $this->assertSame('save', $result->getClass());
-//    }
+    }
 }
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index de0cccfd2f3..c0df88e2e65 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -26,16 +26,16 @@ class LinksTest extends TestCase
 {
     private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links $subject;
 
-//    public static function setUpBeforeClass(): void
-//    {
-//        Mage::app();
-//        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links();
-//    }
+    public static function setUpBeforeClass(): void
+    {
+        Mage::app();
+        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links();
+    }
 
-//    public static function tearDownAfterClass(): void
-//    {
-//        self::$subject = null;
-//    }
+    public static function tearDownAfterClass(): void
+    {
+        self::$subject = null;
+    }
 
     /**
      * @covers Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links::getButtonAddBlock()
@@ -45,14 +45,15 @@ class LinksTest extends TestCase
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonAddBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonAddBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonAddBlock();
 //        $this->assertSame('add_link_item', $result->getId());
 //        $this->assertSame('Add New Row', $result->getLabel());
 //        $this->assertNull($result->getOnClick());
 //        $this->assertSame('add', $result->getClass());
-//    }
+    }
 }
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index b79762bee44..848635a4ce7 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -45,15 +45,16 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonUploadBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
-//
+    public function testGetButtonUploadBlock(): void
+    {
+        self::$subject->setLayout(new Mage_Core_Model_Layout());
+        $this->markTestIncomplete();
+
 //        $result = self::$subject->getButtonUploadBlock();
 //        $this->assertSame('', $result->getId());
 //        $this->assertSame('Upload Files', $result->getLabel());
 //        $this->assertSame('Downloadable.massUploadByType(\'samples\')', $result->getOnClick());
 //        $this->assertNull($result->getClass());
 //        $this->assertSame('button', $result->getType());
-//    }
+    }
 }

From 76eca58f6e20df2514f62cd2288577319f7876c8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 07:42:12 +0100
Subject: [PATCH 06/10] rector

---
 .../Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php       | 2 ++
 .../Block/Sales/Order/Creditmemo/Create/ItemsTest.php         | 2 ++
 tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php | 4 ++++
 .../Catalog/Product/Edit/Tab/Downloadable/LinksTest.php       | 1 +
 .../Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php     | 1 +
 5 files changed, 10 insertions(+)

diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
index 1d1cc9c2ae8..5128b4e0543 100644
--- a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
@@ -45,6 +45,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonCreateEmptyBlock(): void
     {
@@ -65,6 +66,7 @@ public function testGetButtonCreateEmptyBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonCreateFromConfigurableBlock(): void
     {
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
index f03afe64a1e..a7d134783b6 100644
--- a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
@@ -48,6 +48,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonUpdateBlock(): void
     {
@@ -68,6 +69,7 @@ public function testGetButtonUpdateBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonRefundBlock(): void
     {
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
index fb13d6d6f5f..61d3991c233 100644
--- a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
@@ -45,6 +45,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonBackBlock(): void
     {
@@ -65,6 +66,7 @@ public function testGetButtonBackBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonDeleteBlock(): void
     {
@@ -85,6 +87,7 @@ public function testGetButtonDeleteBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonResetBlock(): void
     {
@@ -105,6 +108,7 @@ public function testGetButtonResetBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonSaveBlock(): void
     {
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index c0df88e2e65..3e3a3a07707 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -44,6 +44,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonAddBlock(): void
     {
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index 848635a4ce7..c0618c84c86 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -44,6 +44,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonUploadBlock(): void
     {

From 540142658c163dd527b635e89ea8bd4b7c6879af Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 07:43:01 +0100
Subject: [PATCH 07/10] phpcsfixer

---
 .../Catalog/Product/Edit/Tab/Downloadable/LinksTest.php         | 2 +-
 .../Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php       | 2 +-
 tests/unit/Mage/Uploader/Block/MultipleTest.php                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index 3e3a3a07707..ceb99031c82 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -18,8 +18,8 @@
 namespace OpenMage\Tests\Unit\Mage\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 use Mage;
-use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links;
 use Mage_Core_Model_Layout;
+use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links;
 use PHPUnit\Framework\TestCase;
 
 class LinksTest extends TestCase
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index c0618c84c86..f603889634b 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -18,8 +18,8 @@
 namespace OpenMage\Tests\Unit\Mage\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
 use Mage;
-use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples;
 use Mage_Core_Model_Layout;
+use Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples;
 use PHPUnit\Framework\TestCase;
 
 class SamplesTest extends TestCase
diff --git a/tests/unit/Mage/Uploader/Block/MultipleTest.php b/tests/unit/Mage/Uploader/Block/MultipleTest.php
index 0cd1e2f0e0e..3864ed7f36d 100644
--- a/tests/unit/Mage/Uploader/Block/MultipleTest.php
+++ b/tests/unit/Mage/Uploader/Block/MultipleTest.php
@@ -18,8 +18,8 @@
 namespace OpenMage\Tests\Unit\Mage\Uploader\Block;
 
 use Mage;
-use Mage_Uploader_Block_Multiple;
 use Mage_Core_Model_Layout;
+use Mage_Uploader_Block_Multiple;
 use PHPUnit\Framework\TestCase;
 
 class MultipleTest extends TestCase

From e82eb5bf2d9eb216c3f9f9d544b0b47fe8eb7517 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 11:23:45 +0100
Subject: [PATCH 08/10] cleanup

---
 .../core/Mage/Adminhtml/Block/Api/Buttons.php |  17 +-
 .../Block/Catalog/Category/Edit/Form.php      |  12 +-
 .../Adminhtml/Block/Catalog/Category/Tree.php |   4 +-
 .../Product/Attribute/New/Product/Created.php |   4 +-
 .../Catalog/Product/Attribute/Set/Main.php    |  24 +-
 .../Attribute/Set/Main/Formattribute.php      |   4 +-
 .../Product/Attribute/Set/Main/Formgroup.php  |   4 +-
 .../Product/Attribute/Set/Toolbar/Add.php     |   6 +-
 .../Product/Attribute/Set/Toolbar/Main.php    |   4 +-
 .../Block/Catalog/Product/Created.php         |   4 +-
 .../Adminhtml/Block/Catalog/Product/Edit.php  |  32 +--
 .../Catalog/Product/Edit/Action/Attribute.php |  13 +-
 .../Catalog/Product/Edit/Tab/Options.php      |   4 +-
 .../Product/Edit/Tab/Options/Option.php       |   4 +-
 .../Product/Edit/Tab/Options/Type/Select.php  |   8 +-
 .../Catalog/Product/Edit/Tab/Price/Group.php  |   4 +-
 .../Catalog/Product/Edit/Tab/Price/Tier.php   |   4 +-
 .../Catalog/Product/Edit/Tab/Settings.php     |   2 +-
 .../Catalog/Product/Edit/Tab/Super/Config.php |   4 +-
 .../Product/Edit/Tab/Super/Settings.php       |   8 +-
 .../Block/Customer/Edit/Tab/Addresses.php     |  12 +-
 .../Adminhtml/Block/Newsletter/Problem.php    |   4 +-
 .../Adminhtml/Block/Newsletter/Queue/Edit.php |  18 +-
 .../Block/Newsletter/Template/Edit.php        |  22 +-
 .../Adminhtml/Block/Permissions/Buttons.php   |  17 +-
 .../core/Mage/Adminhtml/Block/Report/Grid.php |   4 +-
 .../Block/Sales/Order/Comments/View.php       |   4 +-
 .../Block/Sales/Order/Create/Customer.php     |   4 +-
 .../Block/Sales/Order/Create/Search.php       |   2 +-
 .../Sales/Order/Creditmemo/Create/Items.php   |  12 +-
 .../Sales/Order/Invoice/Create/Items.php      |   6 +-
 .../Sales/Order/Invoice/Create/Tracking.php   |   4 +-
 .../Sales/Order/Shipment/Create/Items.php     |   2 +-
 .../Sales/Order/Shipment/Create/Tracking.php  |   4 +-
 .../Sales/Order/Shipment/View/Tracking.php    |   4 +-
 .../Block/Sales/Order/View/Giftmessage.php    |   4 +-
 .../Block/Sales/Order/View/History.php        |   4 +-
 .../Adminhtml/Block/System/Cache/Edit.php     |   4 +-
 .../Adminhtml/Block/System/Config/Edit.php    |   4 +-
 .../Adminhtml/Block/System/Config/Tabs.php    |   8 +-
 .../System/Convert/Profile/Edit/Tab/Run.php   |   2 +-
 .../Mage/Adminhtml/Block/System/Currency.php  |  12 +-
 .../Mage/Adminhtml/Block/System/Design.php    |   4 +-
 .../Adminhtml/Block/System/Design/Edit.php    |  12 +-
 .../Adminhtml/Block/System/Email/Template.php |   4 +-
 .../Block/System/Email/Template/Edit.php      |  34 +--
 .../Block/System/Store/Delete/Group.php       |  12 +-
 .../Block/System/Store/Delete/Website.php     |  12 +-
 .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php  |   4 +-
 .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php |  12 +-
 .../core/Mage/Adminhtml/Block/Template.php    | 234 +++++-------------
 .../Mage/Adminhtml/Block/Urlrewrite/Edit.php  |   2 +-
 .../Block/Widget/Form/Element/Gallery.php     |   8 +-
 .../Block/Adminhtml/Attribute/Buttons.php     |   9 +-
 .../Api2/Block/Adminhtml/Roles/Buttons.php    |  17 +-
 .../Catalog/Product/Edit/Tab/Bundle.php       |   4 +-
 .../Product/Edit/Tab/Bundle/Option.php        |   6 +-
 .../Product/Edit/Tab/Bundle/Option/Search.php |   2 +-
 .../Edit/Tab/Bundle/Option/Selection.php      |   2 +-
 .../Block/Adminhtml/System/Currencysymbol.php |   2 +-
 .../Product/Edit/Tab/Downloadable/Links.php   |   4 +-
 .../Product/Edit/Tab/Downloadable/Samples.php |   2 +-
 .../Attribute/Edit/Options/Abstract.php       |   8 +-
 .../core/Mage/Uploader/Block/Abstract.php     |   4 +-
 .../core/Mage/Uploader/Block/Multiple.php     |   4 +-
 .../Mage/Weee/Block/Renderer/Weee/Tax.php     |   2 +-
 .../Widget/Instance/Edit/Tab/Main/Layout.php  |   4 +-
 .../Block/Catalog/Category/Edit/FormTest.php  |  28 ++-
 .../Product/Edit/Tab/Super/ConfigTest.php     |  15 +-
 .../Block/Newsletter/Queue/EditTest.php       |   2 +-
 .../Block/Newsletter/Template/EditTest.php    |   2 +-
 .../Order/Creditmemo/Create/ItemsTest.php     |  21 +-
 .../Block/Tax/Rate/Toolbar/SaveTest.php       |  20 +-
 .../Adminhtml/Block/Urlrewrite/EditTest.php   |   6 +-
 .../Edit/Tab/Downloadable/LinksTest.php       |  11 +-
 .../Edit/Tab/Downloadable/SamplesTest.php     |  11 +-
 .../unit/Mage/Uploader/Block/MultipleTest.php |   1 +
 77 files changed, 383 insertions(+), 465 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
index 3ab017e9d72..d22bd89f321 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
@@ -48,15 +48,14 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick('window.location.href=\'' . $this->getUrl('*/*/') . '\'');
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
             ->setOnClick(
                 'if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
@@ -65,16 +64,16 @@ public function getButtonDeleteBlock(string $name = '', array $attributes = []):
             );
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location.reload()')
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
             ->setOnClick('roleForm.submit();return false;');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
index f978fdbf816..6fb695e69a8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -64,28 +64,28 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('catalog')->__('Delete Category'))
             ->setOnClick("categorySubmit('" . $this->getSaveUrl() . "', true)");
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $category   = $this->getCategory();
         $categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
         $resetPath  = $categoryId ? '*/*/edit' : '*/*/add';
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick("categoryReset('" . $this->getUrl($resetPath, ['_current' => true]) . "',true)")
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $category   = $this->getCategory();
         $categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('catalog')->__('Save Category'))
             ->setOnClick("categoryDelete('" . $this->getUrl('*/*/delete', ['_current' => true]) . "', true, {$categoryId})");
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
index 79ac96a8aa4..cfd7d40b292 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -57,7 +57,7 @@ protected function _prepareLayout()
 
     public function getButtonAddRootBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_root_category_button')
             ->setLabel(Mage::helper('catalog')->__('Add Root Category'))
             ->setOnClick("addNew('" . $this->getAddUrl() . "', true)");
@@ -65,7 +65,7 @@ public function getButtonAddRootBlock(): Mage_Adminhtml_Block_Widget_Button
 
     public function getButtonAddSubBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_subcategory_button')
             ->setLabel(Mage::helper('catalog')->__('Add Subcategory'))
             ->setOnClick("addNew('" . $this->getAddUrl() . "', false)")
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
index 7c17fb7efaa..7abd2d3dd27 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
@@ -50,9 +50,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_CLOSE, $this->getButtonCloseBlock());
     }
 
-    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonCloseBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonCloseBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CLOSE)
             ->setOnClick('addAttribute(true)');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
index 9a238ea29fd..dda475da7b3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
@@ -66,22 +66,22 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_RENAME, $this->getButtonRenameBlock());
     }
 
-    public function getButtonAddGroupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddGroupBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add New'))
             ->setOnClick('editSet.addGroup();');
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl();
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('catalog')->__('Delete Attribute Set'))
             ->setOnClick(Mage::helper('core/js')->getDeleteConfirmJs(
                 $this->getUrlSecure('*/*/delete', ['id' => $this->_getSetId()]),
@@ -89,9 +89,9 @@ public function getButtonDeleteBlock(string $name = '', array $attributes = []):
             ));
     }
 
-    public function getButtonDeleteGroupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteGroupBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('catalog')->__('Delete Selected Group'))
             ->setOnClick('editSet.submit();');
     }
@@ -103,16 +103,16 @@ public function getButtonRenameBlock(string $name = '', array $attributes = []):
             ->setOnClick('editSet.rename()');
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location.reload()')
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('catalog')->__('Save Attribute Set'))
             ->setOnClick('editSet.save();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
index 33afc18885b..fcc9c33065f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
@@ -50,9 +50,9 @@ protected function _prepareForm()
         return $this;
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add Attribute'))
             ->setOnClick('this.form.submit();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
index 67354e41dff..d04f23dc6c5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
@@ -60,9 +60,9 @@ protected function _prepareForm()
         return $this;
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add Group'))
             ->setOnClick('this.form.submit();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
index 5412c9a795b..03027803ca6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
@@ -47,15 +47,15 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsFullUrl($this->getUrl('*/*/'));
     }
 
     public function getButtonSaveGroupBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('catalog')->__('Save Attribute Set'))
             ->setOnClick('if (addSet.submit()) disableElements(\'save\');')
             ->resetClass();
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
index 2f4137cfda9..9d31124feb8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
@@ -44,9 +44,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add New Set'))
             ->setOnClickSetLocationJsUrl('*/*/add');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
index e9e02cf2e62..0fe30f1237a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
@@ -45,9 +45,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_CLOSE, $this->getButtonCloseBlock());
     }
 
-    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonCloseBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonCloseBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CLOSE)
             ->setOnClick('addProduct(true)');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
index 1835a3c1755..be573d4aff8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -68,50 +68,50 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl('*/*/', [
                 'store' => $this->getRequest()->getParam('store', 0),
             ]);
     }
 
 
-    public function getButtonBackPopupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackPopupBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackPopupBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CANCEL)
             ->setLabel(Mage::helper('catalog')->__('Close Window'));
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDeleteUrl()));
     }
 
-    public function getButtonDuplicateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDuplicateBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDuplicateBlock($name, $attributes)
-            ->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDuplicateUrl()))
-            ->setClass(self::BUTTON__CLASS_ADD);
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
+            ->setLabel(Mage::helper('adminhtml')->__('Duplicate'))
+            ->setOnClick(Mage::helper('core/js')->getConfirmSetLocationJs($this->getDuplicateUrl()));
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick(Mage::helper('core/js')->getSetLocationJs($this->getUrl('*/*/*', ['_current' => true])))
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setOnClick('productForm.submit()');
     }
 
-    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveAndContinueBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveAndContinueBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE_AND_CONTINUE)
             ->setOnClick(Mage::helper('core/js')->getSaveAndContinueEditJs($this->getSaveAndContinueUrl()));
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
index 3b4fa67c22d..91eb9f512b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
@@ -42,23 +42,24 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl('*/catalog_product/', [
                 'store' => $this->getRequest()->getParam('store', 0)
             ]);
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
+            ->setOnClickSetLocationJsUrl('*/*/*', ['_current' => true])
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setOnClick('attributesForm.submit()');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
index e5b55b753c0..cd4953790fa 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
@@ -45,9 +45,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_new_defined_option')
             ->setLabel(Mage::helper('catalog')->__('Add New Option'));
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
index 110ae1c22e3..d4df8e91cea 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
@@ -131,9 +131,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('catalog')->__('Delete Option'))
             ->addClass('delete-product-option');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
index a234f3eb38a..51afdff7fcd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
@@ -56,17 +56,17 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_select_row_button_{{option_id}}')
             ->setLabel(Mage::helper('catalog')->__('Add New Row'))
             ->addClass('add-select-row');
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setId('delete_select_row_button')
             ->setLabel(Mage::helper('catalog')->__('Delete Row'))
             ->addClass('delete-select-row icon-btn');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
index 18d42fd6d4a..4806e48912d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
@@ -72,9 +72,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add Group Price'))
             ->setOnClick('return groupPriceControl.addItem()')
             ->setName('add_group_price_item_button');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
index d73ae874211..06089897948 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
@@ -89,9 +89,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add Tier'))
             ->setOnClick('return tierPriceControl.addItem()')
             ->setName('add_tier_price_item_button');
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
index fb5d7423d03..9716a008c78 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php
@@ -44,7 +44,7 @@ protected function addButtons(): void
 
     public function getButtonContinueBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('catalog')->__('Continue'))
             ->setOnClick("setSettings('" . $this->getContinueUrl() . "','attribute_set_id','product_type')");
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
index a3128e7c85a..88cd29f120e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
@@ -114,14 +114,14 @@ protected function _prepareLayout()
 
     public function getButtonCreateEmptyBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Create Empty'))
             ->setOnClick('superProduct.createEmptyProduct()');
     }
 
     public function getButtonCreateFromConfigurableBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Copy From Configurable'))
             ->setOnClick('superProduct.createNewProduct()');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
index 7e629bb9ad4..d6d6b08a7da 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
@@ -43,16 +43,16 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsFullUrl($this->getBackUrl());
     }
 
-    public function getButtonContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonContinueBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $onclick = "setSuperSettings('" . $this->getContinueUrl() . "','attribute-checkbox', 'attributes')";
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('catalog')->__('Continue'))
             ->setOnClick($onclick);
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index 7206dd9637a..db2587a5d3f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -54,9 +54,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_CANCEL, $this->getButtonCancelBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_address_button')
             ->setLabel(Mage::helper('customer')->__('Add New Address'))
             ->setOnClick('customerAddresses.addNewAddress()')
@@ -66,9 +66,9 @@ public function getButtonAddBlock(string $name = '', array $attributes = []): Ma
             ->setName('add_address_button');
     }
 
-    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonCancelBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonCancelBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CANCEL)
             ->setId('cancel_add_address' . $this->getTemplatePrefix())
             ->setLabel(Mage::helper('customer')->__('Cancel'))
             ->setOnClick('customerAddresses.cancelAdd(this)')
@@ -78,9 +78,9 @@ public function getButtonCancelBlock(string $name = '', array $attributes = []):
             ->setName('cancel_address');
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('customer')->__('Delete Address'))
             ->addClass($this->isReadonly() ? ' disabled' : '')
             ->setDisabled($this->isReadonly())
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
index 6f7bb834b34..70a644b0ab5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
@@ -58,9 +58,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_UNSUBSCRIBE, $this->getButtonUnsubscribeBlock());
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock('del.button')
+        return parent::getButtonBlockByType(self::BUTTON_DELETE, 'del.button')
             ->setLabel(Mage::helper('newsletter')->__('Delete Selected Problems'))
             ->setOnClick('problemController.deleteSelected();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
index bce04237fb8..bb67f85b4a3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -106,11 +106,11 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $route = $this->getTemplateId() ? '*/newsletter_template/' : '*/*';
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick("window.location.href = '" . $this->getUrl($route) . "'");
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
+            ->setOnClick("window.location.href='" . $this->getUrl($route) . "'");
     }
 
     public function getButtonPreviewBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
@@ -121,22 +121,22 @@ public function getButtonPreviewBlock(string $name = '', array $attributes = [])
             ->setClass(self::BUTTON__CLASS_TASK);
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location = window.location');
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('newsletter')->__('Save Newsletter'))
             ->setOnClick('queueControl.save()');
     }
 
-    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveAndContinueBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveAndContinueBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE_AND_CONTINUE)
             ->setLabel(Mage::helper('newsletter')->__('Save and Resume'))
             ->setOnClick('queueControl.resume()');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
index 0109d9957e2..8f017969932 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
@@ -75,15 +75,14 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick("window.location.href = '" . $this->getUrl('*/*') . "'");
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('newsletter')->__('Delete Template'))
             ->setOnClick('templateControl.deleteTemplate();');
     }
@@ -96,23 +95,22 @@ public function getButtonPreviewBlock(string $name = '', array $attributes = [])
             ->setClass(self::BUTTON__CLASS_TASK);
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
-            ->setOnClick('window.location.href = window.location.href')
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('newsletter')->__('Save Template'))
             ->setOnClick('templateControl.save();');
     }
 
-    public function getButtonSaveAsBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveAsBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('newsletter')->__('Save As'))
             ->setOnClick('templateControl.saveAs();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
index 5ed2c3b6872..b67a0e5d3f2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
@@ -48,31 +48,30 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick('window.location.href=\'' . $this->getUrl('*/*/') . '\'');
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
             ->setOnClick('if(confirm(\'' . Mage::helper('core')->jsQuoteEscape(
                 Mage::helper('adminhtml')->__('Are you sure you want to do this?')
             ) . '\')) roleForm.submit(\'' . $this->getUrl('*/*/delete') . '\'); return false;');
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location.reload()')
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
             ->setOnClick('roleForm.submit();return false;');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index 75d25fd4863..a803d7c8f97 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -101,9 +101,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_REFRESH, $this->getButtonRefreshBlock());
     }
 
-    public function getButtonRefreshBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonRefreshBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonRefreshBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_REFRESH)
             ->setOnClick($this->getRefreshButtonCallback());
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
index f21c0e64de1..cf012b33619 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
@@ -52,9 +52,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSaveBlock());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setId('submit_comment_button')
             ->setLabel(Mage::helper('sales')->__('Submit Comment'));
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
index af390cd6c9a..fcd92fb4ba2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
@@ -37,12 +37,12 @@ public function getHeaderText()
      */
     public function getButtonsHtml()
     {
-        $customer = parent::getButtonAddBlock()
+        $customer = parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('sales')->__('Create New Customer'))
             ->setOnClick('order.setCustomerId(false)')
             ->toHtml();
 
-        $guest = parent::getButtonAddBlock()
+        $guest = parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('sales')->__('Create Guest Order'))
             ->setOnClick('order.setCustomerIsGuest()')
             ->toHtml();
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
index 4d11d4e7c8f..423ad0302e1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
@@ -37,7 +37,7 @@ public function getHeaderText()
      */
     public function getButtonsHtml()
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('sales')->__('Add Selected Product(s) to Order'))
             ->setOnClick('order.productGridAddSelected()')
             ->toHtml();
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
index 44360fa223d..91406387c42 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
@@ -46,25 +46,25 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
-    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonUpdateBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $onclick = "submitAndReloadArea($('creditmemo_item_container'),'" . $this->getUpdateUrl() . "')";
-        return parent::getButtonUpdateBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_UPDATE)
             ->setLabel(Mage::helper('sales')->__('Update Qty\'s'))
             ->setOnClick($onclick);
     }
 
-    public function getButtonRefundBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonRefundBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('sales')->__('Refund'))
             ->setOnClick('disableElements(\'submit-button\');submitCreditMemo()')
             ->addClass('submit-button');
     }
 
-    public function getButtonRefundOfflineBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonRefundOfflineBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('sales')->__('Refund Offline'))
             ->setOnClick('disableElements(\'submit-button\');submitCreditMemoOffline()')
             ->addClass('submit-button');
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
index 05c8f902560..19d57377f20 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
@@ -63,17 +63,17 @@ public function getButtonSubmitBlock(): Mage_Adminhtml_Block_Widget_Button
         } else {
             $submitLabel = Mage::helper('sales')->__('Submit Invoice');
         }
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel($submitLabel)
             ->setOnClick('disableElements(\'submit-button\');$(\'edit_form\').submit()')
             ->addClass('submit-button' . $submitButtonClass)
             ->setDisabled($this->_disableSubmitButton);
     }
 
-    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonUpdateBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $onclick = "submitAndReloadArea($('invoice_item_container'),'" . $this->getUpdateUrl() . "')";
-        return parent::getButtonUpdateBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_UPDATE)
             ->setLabel(Mage::helper('sales')->__('Update Qty\'s'))
             ->setOnClick($onclick);
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
index 4324339fc50..ccb8437f3a8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
@@ -42,9 +42,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('sales')->__('Add Tracking Number'))
             ->setOnClick('trackingControl.add()')
             ->resetClass();
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
index 722ca731246..bdfb22be0f2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
@@ -64,7 +64,7 @@ protected function _beforeToHtml()
 
     public function getButtonSubmitBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('sales')->__('Submit Shipment'))
             ->setOnClick('submitShipment(this);')
             ->addClass('submit-button');
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
index 79fd04099c8..db175fd9e0b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
@@ -41,9 +41,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('sales')->__('Add Tracking Number'))
             ->setOnClick('trackingControl.add()')
             ->resetClass();
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
index 917b3bf9531..6e581b6b59f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
@@ -41,10 +41,10 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $onclick = "submitAndReloadArea($('shipment_tracking_info').parentNode, '" . $this->getSubmitUrl() . "')";
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('sales')->__('Add'))
             ->setOnClick($onclick);
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
index cacea74b06f..7d3677b133a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -72,9 +72,9 @@ protected function _prepareLayout()
         return $this;
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('giftmessage')->__('Save Gift Message'));
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
index 9e6667d8499..1db6e8d6421 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
@@ -40,10 +40,10 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SUBMIT, $this->getButtonSaveBlock());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $onclick = "submitAndReloadArea($('order_history_block').parentNode, '" . $this->getSubmitUrl() . "')";
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('sales')->__('Submit Comment'))
             ->setOnClick($onclick);
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
index 6d377868000..716142c2e7c 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php
@@ -51,9 +51,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Cache Settings'))
             ->setOnClick('configForm.submit()');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
index 792c66a0de0..20e9c237a53 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php
@@ -63,9 +63,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Config'))
             ->setOnClick('configForm.submit()');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
index b7a1c7bd397..bac5e68eae1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
@@ -277,7 +277,7 @@ public function getStoreButtonsHtml()
 
     public function getButtonDeleteStoreViewBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock()
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Store View'))
             ->setOnClick("location.href='" . $this->getUrl('*/system_store/delete', ['store' => $this->getRequest()->getParam('store')]) . "'");
     }
@@ -291,14 +291,14 @@ public function getButtonEditStoreViewBlock(): Mage_Adminhtml_Block_Widget_Butto
 
     public function getButtonNewStoreViewBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('adminhtml')->__('New Store View'))
             ->setOnClick("location.href='" . $this->getUrl('*/system_store/new', ['website' => $this->getRequest()->getParam('website')]) . "'");
     }
 
     public function getButtonDeleteWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock()
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Website'))
             ->setOnClick("location.href='" . $this->getUrl('*/system_website/delete', ['website' => $this->getRequest()->getParam('website')]) . "'");
     }
@@ -312,7 +312,7 @@ public function getButtonEditWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
 
     public function getButtonNewWebsiteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('adminhtml')->__('New Website'))
             ->setOnClick("location.href='" . $this->getUrl('*/system_website/new') . "'");
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
index a331efc7508..a7d9380ef86 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
@@ -26,7 +26,7 @@ class Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Run extends Mage_Admi
 
     public function getRunButtonHtml()
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel($this->__('Run Profile in Popup'))
             ->setOnClick('runProfile(true)')
             ->toHtml();
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
index 3103f64df9a..ff9be47b703 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
@@ -58,22 +58,22 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_IMPORT, $this->getButtonImportBlock());
     }
 
-    public function getButtonImportBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonImportBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('adminhtml')->__('Import'))
             ->setType(Mage_Adminhtml_Block_Widget_Button::TYPE_SUBMIT);
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('document.location.reload()');
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Currency Rates'))
             ->setOnClick('currencyForm.submit();');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php
index 9b5e90e35d0..fd7ecb14c70 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php
@@ -46,9 +46,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('catalog')->__('Add Design Change'))
             ->setOnClickSetLocationJsUrl('*/*/new');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
index ef4d4fcd7ac..df88f190c12 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
@@ -44,21 +44,21 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl();
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setOnClickSetLocationJsFullUrl($this->getDeleteUrl());
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setOnClick('designForm.submit()');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
index a58f14a9dd2..ba45a7923cb 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
@@ -48,9 +48,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('adminhtml')->__('Add New Template'))
             ->setOnClick("window.location='" . $this->getCreateUrl() . "'");
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
index 0011cd450d6..9d5e9eb9b54 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -61,16 +61,21 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_LOAD, $this->getButtonLoadBlock());
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
+    }
+
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
+    {
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Template'))
             ->setOnClick('templateControl.deleteTemplate();');
     }
 
-    public function getButtonLoadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonLoadBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Load Template'))
             ->setOnClick('templateControl.load();')
             ->setType('button');
@@ -83,40 +88,39 @@ public function getButtonPreviewBlock(string $name = '', array $attributes = [])
             ->setOnClick('templateControl.preview();');
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
-            ->setOnClick('window.location.href = window.location.href')
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Template'))
             ->setOnClick('templateControl.save();');
     }
 
-    public function getButtonToHtmllock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonToHtmllock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBlock($name, $attributes)
+        return parent::getButtonBlock()
             ->setId('convert_button_back')
             ->setLabel(Mage::helper('adminhtml')->__('Return Html Version'))
             ->setOnClick('templateControl.unStripTags();')
             ->setStyle('display:none');
     }
 
-    public function getButtonToPlainBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonToPlainBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBlock($name, $attributes)
+        return parent::getButtonBlock()
             ->setId('convert_button')
             ->setLabel(Mage::helper('adminhtml')->__('Convert to Plain Text'))
             ->setOnClick('templateControl.stripTags();');
     }
 
-    public function getButtonToggleBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonToggleBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBlock($name, $attributes)
+        return parent::getButtonBlock()
             ->setId('toggle_button')
             ->setLabel(Mage::helper('adminhtml')->__('Toggle Editor'))
             ->setOnClick('templateControl.toggleEditor();');
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
index 2ad1624cec8..2c6fbcb6bf9 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
@@ -51,24 +51,24 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $itemId = $this->getRequest()->getParam(self::DATA_ID);
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl('*/*/editGroup', [self::DATA_ID => $itemId])
             ->setClass(self::BUTTON__CLASS_CANCEL);
     }
 
-    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonCancelBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $itemId = $this->getRequest()->getParam(self::DATA_ID);
-        return parent::getButtonCancelBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CANCEL)
             ->setOnClickSetLocationJsUrl('*/*/editGroup', [self::DATA_ID => $itemId]);
     }
 
-    public function getButtonConfirmDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonConfirmDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonCancelBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CANCEL)
             ->setLabel(Mage::helper('core')->__('Delete Store'))
             ->setOnClick('deleteForm.submit()');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
index 80bc8532989..d37900fc277 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
@@ -50,24 +50,24 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_BACK, $this->getButtonBackBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $itemId  = $this->getRequest()->getParam(self::DATA_ID);
-        return parent::getButtonBackBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_BACK)
             ->setOnClickSetLocationJsUrl('*/*/editWebsite', [self::DATA_ID => $itemId])
             ->setClass(self::BUTTON__CLASS_CANCEL);
     }
 
-    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonCancelBlock(): Mage_Adminhtml_Block_Widget_Button
     {
         $itemId  = $this->getRequest()->getParam(self::DATA_ID);
-        return parent::getButtonCancelBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_CANCEL)
             ->setOnClickSetLocationJsUrl('*/*/editWebsite', [self::DATA_ID => $itemId]);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('core')->__('Delete Website'))
             ->setOnClick('deleteForm.submit()')
             ->setClass(self::BUTTON__CLASS_CANCEL);
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
index 18bb9206994..c02e81ea0f8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
@@ -44,9 +44,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('tax')->__('Add New Tax Rate'))
             ->setOnClick('window.location.href=\'' . $this->getUrl('*/tax_rate/add') . '\'');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
index 07bfeeae803..5d5671220c3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
@@ -60,22 +60,22 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('tax')->__('Delete Rate'))
             ->setOnClickSetLocationJsUrl('*/*/delete', ['rate' => $this->getRequest()->getParam('rate')]);
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location.reload()');
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('tax')->__('Save Rate'))
             ->setOnClick('wigetForm.submit();return false;');
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index eb508e83beb..b29f3913bd4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -22,28 +22,28 @@
  */
 class Mage_Adminhtml_Block_Template extends Mage_Core_Block_Template
 {
-    public const BUTTON_ADD                 = 'add_button';
-    public const BUTTON_BACK                = 'back_button';
-    public const BUTTON_CANCEL              = 'cancel_button';
-    public const BUTTON_CLOSE               = 'close_button';
-    public const BUTTON_DELETE              = 'delete_button';
-    public const BUTTON_DUPLICATE           = 'duplicate_button';
-    public const BUTTON_RESET               = 'reset_button';
-    public const BUTTON_REFRESH             = 'refresh_button';
-    public const BUTTON_SAVE                = 'save_button';
-    public const BUTTON_SAVE_AND_CONTINUE   = 'save_and_edit_button';
-    public const BUTTON_SUBMIT              = 'submit_button';
-    public const BUTTON_UPDATE              = 'update_button';
-    public const BUTTON_UPLOAD              = 'upload_button';
-
-    public const BUTTON__CLASS_ADD          = 'add';
-    public const BUTTON__CLASS_BACK         = 'back';
-    public const BUTTON__CLASS_CANCEL       = 'cancel';
-    public const BUTTON__CLASS_DELETE       = 'delete';
-    public const BUTTON__CLASS_RESET        = 'reset';
-    public const BUTTON__CLASS_SAVE         = 'save';
-    public const BUTTON__CLASS_TASK         = 'task';
-    public const BUTTON__CLASS_UPDATE       = 'update-button';
+    public const BUTTON_ADD                         = 'add_button';
+    public const BUTTON_BACK                        = 'back_button';
+    public const BUTTON_CANCEL                      = 'cancel_button';
+    public const BUTTON_CLOSE                       = 'close_button';
+    public const BUTTON_DELETE                      = 'delete_button';
+    public const BUTTON_DUPLICATE                   = 'duplicate_button';
+    public const BUTTON_RESET                       = 'reset_button';
+    public const BUTTON_REFRESH                     = 'refresh_button';
+    public const BUTTON_SAVE                        = 'save_button';
+    public const BUTTON_SAVE_AND_CONTINUE           = 'save_and_edit_button';
+    public const BUTTON_SUBMIT                      = 'submit_button';
+    public const BUTTON_UPDATE                      = 'update_button';
+    public const BUTTON_UPLOAD                      = 'upload_button';
+
+    public const BUTTON__CLASS_ADD                  = 'add';
+    public const BUTTON__CLASS_BACK                 = 'back';
+    public const BUTTON__CLASS_CANCEL               = 'cancel';
+    public const BUTTON__CLASS_DELETE               = 'delete';
+    public const BUTTON__CLASS_RESET                = 'reset';
+    public const BUTTON__CLASS_SAVE                 = 'save';
+    public const BUTTON__CLASS_TASK                 = 'task';
+    public const BUTTON__CLASS_UPDATE               = 'update-button';
 
     /**
      * @return string
@@ -108,157 +108,54 @@ public function getButtonBlock(string $name = '', array $attributes = []): Mage_
         return $this->createWidgetButtonBlock($name, $attributes);
     }
 
-    private function createWidgetAddButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Add'))
-            ->setClass(self::BUTTON__CLASS_ADD);
-    }
-
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetAddButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetBackButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Back'))
-            ->setOnClick("window.location.href='" . $this->getUrl('*/*') . "'")
-            ->setClass(self::BUTTON__CLASS_BACK);
-    }
-
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetBackButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetCancelButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Cancel'))
-            ->setOnClick('window.close()')
-            ->setClass(self::BUTTON__CLASS_CANCEL);
-    }
-
-    public function getButtonCancelBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetCancelButtonBlock($name, $attributes);
-    }
-
-    public function getButtonBackPopupBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetCancelButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetCloseButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Close Window'))
-            ->setOnClick('window.close()');
-    }
-
-    public function getButtonCloseBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetCloseButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetDeleteButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Delete'))
-            ->setClass(self::BUTTON__CLASS_DELETE);
-    }
-
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetDeleteButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetDuplicateleteButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetAddButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Duplicate'))
-            ->setOnClickSetLocationJsFullUrl($this->getDuplicateUrl());
-    }
-
-    public function getButtonDuplicateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetDuplicateleteButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetRefreshButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Refresh'))
-            ->setClass(self::BUTTON__CLASS_TASK);
-    }
-
-    public function getButtonRefreshBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetRefreshButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetResetButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Reset'))
-            ->setOnClickSetLocationJsUrl('*/*/*', ['_current' => true])
-            ->setClass(self::BUTTON__CLASS_RESET);
-    }
-
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetResetButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetSaveButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Save'))
-            ->setClass(self::BUTTON__CLASS_SAVE);
-    }
-
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetSaveButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetSaveAndContinueButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setLabel(Mage::helper('adminhtml')->__('Save and Continue Edit'))
-            ->setClass(self::BUTTON__CLASS_SAVE);
-    }
-
-    public function getButtonSaveAndContinueBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetSaveAndContinueButtonBlock($name, $attributes);
-    }
-
-    private function createWidgetUpdateButtonBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetButtonBlock($name, $attributes)
-            ->setClass(self::BUTTON__CLASS_UPDATE);
-    }
-
-    public function getButtonUpdateBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
-    {
-        return $this->createWidgetUpdateButtonBlock($name, $attributes);
-    }
-
-    /**
-     * @param self::BUTTON_* $type
-     */
     private function createWidgetButtonBlockByType(string $type, string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
         $button = $this->createWidgetButtonBlock($name, $attributes);
 
         switch ($type) {
-            case self::BUTTON_UPDATE:
-                $button->setClass(self::BUTTON__CLASS_UPDATE);
+            case static::BUTTON_ADD:
+                $button->setLabel(Mage::helper('adminhtml')->__('Add'));
+                $button->setClass(static::BUTTON__CLASS_ADD);
+                break;
+            case static::BUTTON_BACK:
+                $button->setLabel(Mage::helper('adminhtml')->__('Back'));
+                $button->setOnClick("window.location.href='" . $this->getUrl('*/*') . "'");
+                $button->setClass(static::BUTTON__CLASS_BACK);
                 break;
-            case self::BUTTON_UPLOAD:
+            case static::BUTTON_CANCEL:
+                $button->setLabel(Mage::helper('adminhtml')->__('Cancel'));
+                $button->setOnClick('window.close()');
+                $button->setClass(static::BUTTON__CLASS_CANCEL);
+                break;
+            case static::BUTTON_CLOSE:
+                $button->setLabel(Mage::helper('adminhtml')->__('Close Window'));
+                $button->setOnClick('window.close()');
+                break;
+            case static::BUTTON_DELETE:
+                 $button->setLabel(Mage::helper('adminhtml')->__('Delete'));
+                 $button->setClass(static::BUTTON__CLASS_DELETE);
+                break;
+            case static::BUTTON_REFRESH:
+                $button->setLabel(Mage::helper('adminhtml')->__('Refresh'));
+                $button->setClass(static::BUTTON__CLASS_TASK);
+                break;
+            case static::BUTTON_RESET:
+                $button->setLabel(Mage::helper('adminhtml')->__('Reset'));
+                $button->setOnClick('window.location.href = window.location.href');
+                $button->setClass(static::BUTTON__CLASS_RESET);
+                break;
+            case static::BUTTON_SAVE:
+                $button->setLabel(Mage::helper('adminhtml')->__('Save'));
+                $button->setClass(static::BUTTON__CLASS_SAVE);
+                break;
+            case static::BUTTON_SAVE_AND_CONTINUE:
+                $button->setLabel(Mage::helper('adminhtml')->__('Save and Continue Edit'));
+                $button->setClass(static::BUTTON__CLASS_SAVE);
+                break;
+            case static::BUTTON_UPDATE:
+                $button->setClass(static::BUTTON__CLASS_UPDATE);
+                break;
+            case static::BUTTON_UPLOAD:
                 $button->setLabel(Mage::helper('adminhtml')->__('Upload Files'));
                 break;
         }
@@ -266,9 +163,6 @@ private function createWidgetButtonBlockByType(string $type, string $name = '',
         return $button;
     }
 
-    /**
-     * @param self::BUTTON_* $type
-     */
     public function getButtonBlockByType(string $type, string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
     {
         return $this->createWidgetButtonBlockByType($type, $name, $attributes);
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index bc84ff24d00..c592132442d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -121,7 +121,7 @@ protected function _prepareLayout()
 
     public function getButtonSkipCategoriesBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Skip Category Selection'))
             ->setOnClick('window.location = \'' . Mage::helper('adminhtml')->getUrl('*/*/*', [
                     'product' => $this->getProductId()
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
index 0fbc30561c2..6e444a004d5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
@@ -67,16 +67,16 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('adminhtml')->__('Add New Image'))
             ->setOnClick('addNewImage()');
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setOnClick('deleteImage(#image#)');
     }
 
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
index a770f1ffe7f..c9c3c64b6c8 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php
@@ -46,15 +46,14 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_SAVE, $this->getButtonSaveBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick(sprintf("window.location.href='%s';", $this->getUrl('*/*/')));
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setOnClick('form.submit(); return false;');
     }
 
diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
index 5f7341f4405..74c19174a28 100644
--- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
+++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php
@@ -53,29 +53,28 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_DELETE, $this->getButtonDeleteBlock());
     }
 
-    public function getButtonBackBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonBackBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonBackBlock($name, $attributes)
-            ->setOnClick(sprintf("window.location.href='%s';", $this->getUrl('*/*/')));
+        return parent::getButtonBlockByType(self::BUTTON_BACK);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('adminhtml')->__('Delete Role'))
             ->setOnClick('window.location.reload()');
     }
 
-    public function getButtonResetBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonResetBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonResetBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_RESET)
             ->setOnClick('window.location.reload()')
             ->resetClass();
     }
 
-    public function getButtonSaveBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonSaveBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonSaveBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('adminhtml')->__('Save Role'))
             ->setOnClick('roleForm.submit(); return false;');
     }
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index b255445abff..daf2d3f8c91 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -75,9 +75,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_new_option')
             ->setLabel(Mage::helper('bundle')->__('Add New Option'))
             ->setOnClick('bOption.add();');
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 0bcebaaf01a..b204666ece0 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -165,7 +165,7 @@ protected function addButtons(): void
 
     public function getButtonAddSelectionBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId($this->getFieldId() . '_{{index}}_add_button')
             ->setLabel(Mage::helper('bundle')->__('Add Selection'))
             ->setOnClick('bSelection.showSearch(event)');
@@ -173,7 +173,7 @@ public function getButtonAddSelectionBlock(): Mage_Adminhtml_Block_Widget_Button
 
     public function getButtonCloseSearchBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonCloseBlock()
+        return parent::getButtonBlockByType(self::BUTTON_CLOSE)
             ->setId($this->getFieldId() . '_{{index}}_close_button')
             ->setLabel(Mage::helper('bundle')->__('Close'))
             ->setOnClick('bSelection.closeSearch(event)')
@@ -184,7 +184,7 @@ public function getButtonCloseSearchBlock(): Mage_Adminhtml_Block_Widget_Button
 
     public function getButtonOptionDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock()
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel(Mage::helper('catalog')->__('Delete Option'))
             ->setOnClick('bOption.remove(event)')
             ->addClass('delete-product-option');
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index eabe40d772b..19b1000821a 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -72,7 +72,7 @@ protected function _beforeToHtml()
      */
     public function getButtonsHtml()
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_button_' . $this->getIndex())
             ->setLabel(Mage::helper('sales')->__('Add Selected Product(s) to Option'))
             ->setOnClick('bSelection.productGridAddSelected(event)')
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 03c30053e37..50d90bbce3e 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -80,7 +80,7 @@ protected function addButtons(): void
 
     public function getButtonSelectionDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock()
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setOnClick('bSelection.remove(event)')
             ->addClass('icon-btn');
     }
diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index f38884c25dc..254e5cc802a 100644
--- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -56,7 +56,7 @@ public function getHeader()
      */
     public function getSaveButtonHtml()
     {
-        return parent::getButtonSaveBlock()
+        return parent::getButtonBlockByType(self::BUTTON_SAVE)
             ->setLabel(Mage::helper('currencysymbol')->__('Save Currency Symbols'))
             ->setOnClick('currencySymbolsForm.submit();')
             ->toHtml();
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 8608c11a77c..388744ac8c5 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -102,9 +102,9 @@ public function getAddButtonHtml()
         return $this->getButtonAddBlock()->toHtml();
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_link_item')
             ->setLabel(Mage::helper('downloadable')->__('Add New Row'));
     }
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index c74090c6279..db3d45e6232 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -51,7 +51,7 @@ public function isReadonly()
      */
     public function getAddButtonHtml()
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_sample_item')
             ->setLabel(Mage::helper('downloadable')->__('Add New Row'))
             ->toHtml();
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index f91e17fc56a..9637ea78841 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
@@ -43,16 +43,16 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_ADD, $this->getButtonAddBlock());
     }
 
-    public function getButtonAddBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonAddBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonAddBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setId('add_new_option_button')
             ->setLabel(Mage::helper('eav')->__('Add Option'));
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->addClass('delete-option');
     }
 
diff --git a/app/code/core/Mage/Uploader/Block/Abstract.php b/app/code/core/Mage/Uploader/Block/Abstract.php
index 740266e21ee..bb2e0df09f5 100644
--- a/app/code/core/Mage/Uploader/Block/Abstract.php
+++ b/app/code/core/Mage/Uploader/Block/Abstract.php
@@ -161,9 +161,9 @@ public function getButtonBrowseBlock(string $name = '', array $attributes = []):
             ]);
     }
 
-    public function getButtonDeleteBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonDeleteBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonDeleteBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setId('{{id}}')
             ->setLabel(Mage::helper('uploader')->__('Remove'))
             ->setOnClick('')
diff --git a/app/code/core/Mage/Uploader/Block/Multiple.php b/app/code/core/Mage/Uploader/Block/Multiple.php
index 04249e5bcb2..2899b92797c 100644
--- a/app/code/core/Mage/Uploader/Block/Multiple.php
+++ b/app/code/core/Mage/Uploader/Block/Multiple.php
@@ -46,9 +46,9 @@ protected function addButtons(): void
         $this->setChild(self::BUTTON_UPLOAD, $this->getButtonUploadBlock());
     }
 
-    public function getButtonUploadBlock(string $name = '', array $attributes = []): Mage_Adminhtml_Block_Widget_Button
+    public function getButtonUploadBlock(): Mage_Adminhtml_Block_Widget_Button
     {
-        return parent::getButtonUploadBlock($name, $attributes)
+        return parent::getButtonBlockByType(self::BUTTON_UPLOAD)
             ->setId($this->getElementId(self::DEFAULT_UPLOAD_BUTTON_ID_SUFFIX))
             ->setType('button');
     }
diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
index 1777e17c408..fdbd8f8822f 100644
--- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php
@@ -207,7 +207,7 @@ protected function _setAddButton()
     {
         $this->setChild(
             self::BUTTON_ADD,
-            parent::getButtonAddBlock()
+            parent::getButtonBlockByType(self::BUTTON_ADD)
                 ->setId('add_tax_' . $this->getElement()->getHtmlId())
                 ->setLabel(Mage::helper('catalog')->__('Add Tax'))
                 ->setOnClick("weeeTaxControl.addItem('" . $this->getElement()->getHtmlId() . "')")
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 8fcac7e816a..07eb6d8ed12 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -248,7 +248,7 @@ public function getLayoutsChooser()
      */
     public function getAddLayoutButtonHtml()
     {
-        return parent::getButtonAddBlock()
+        return parent::getButtonBlockByType(self::BUTTON_ADD)
             ->setLabel(Mage::helper('widget')->__('Add Layout Update'))
             ->setOnClick('WidgetInstance.addPageGroup({})')
             ->toHtml();
@@ -261,7 +261,7 @@ public function getAddLayoutButtonHtml()
      */
     public function getRemoveLayoutButtonHtml()
     {
-        return parent::getButtonDeleteBlock()
+        return parent::getButtonBlockByType(self::BUTTON_DELETE)
             ->setLabel($this->helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Remove Layout Update')))
             ->setOnClick('WidgetInstance.removePageGroup(this)')
             ->toHtml();
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
index a2ab3377dee..f02f843e735 100644
--- a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
@@ -30,8 +30,14 @@ class FormTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         Mage::app();
-        Mage::register('category', new Mage_Catalog_Model_Category());
-        Mage::register('current_category', new Mage_Catalog_Model_Category());
+
+        if (!Mage::registry('category')) {
+            Mage::register('category', new Mage_Catalog_Model_Category());
+        }
+
+        if (!Mage::registry('current_category')) {
+            Mage::register('current_category', new Mage_Catalog_Model_Category());
+        }
 
         self::$subject = new Mage_Adminhtml_Block_Catalog_Category_Edit_Form();
     }
@@ -50,15 +56,17 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonDeleteBlock(): void
-//    {
+    public function testGetButtonDeleteBlock(): void
+    {
+        $this->markTestSkipped();
+
 //        self::$subject->setLayout(new Mage_Core_Model_Layout());
 //
 //        $result = self::$subject->getButtonDeleteBlock();
 //        $this->assertSame('Delete Category', $result->getLabel());
 //        $this->assertStringStartsWith("categoryDelete('", $result->getOnClick());
 //        $this->assertSame('delete', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Catalog_Category_Edit_Form::getButtonResetBlock()
@@ -69,15 +77,17 @@ public static function tearDownAfterClass(): void
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-//    public function testGetButtonDeleteResetBlock(): void
-//    {
-//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+    public function testGetButtonDeleteResetBlock(): void
+    {
+        $this->markTestSkipped();
+
+        //        self::$subject->setLayout(new Mage_Core_Model_Layout());
 //
 //        $result = self::$subject->getButtonResetBlock();
 //        $this->assertSame('Reset', $result->getLabel());
 //        $this->assertStringStartsWith("categoryReset('", $result->getOnClick());
 //        $this->assertSame('', $result->getClass());
-//    }
+    }
 
     /**
      * @covers Mage_Adminhtml_Block_Catalog_Category_Edit_Form::getButtonSaveBlock()
diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
index 5128b4e0543..40da042bf04 100644
--- a/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
@@ -24,17 +24,17 @@
 
 class ConfigTest extends TestCase
 {
-    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config $subject;
+//    private static ?Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
-        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config();
+//        Mage::app();
+//        self::$subject = new Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config();
     }
 
     public static function tearDownAfterClass(): void
     {
-        self::$subject = null;
+//        self::$subject = null;
     }
 
     /**
@@ -49,9 +49,10 @@ public static function tearDownAfterClass(): void
      */
     public function testGetButtonCreateEmptyBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonCreateEmptyBlock();
 //        $this->assertSame('Create Empty', $result->getLabel());
 //        $this->assertSame('superProduct.createEmptyProduct()', $result->getOnClick());
@@ -70,9 +71,9 @@ public function testGetButtonCreateEmptyBlock(): void
      */
     public function testGetButtonCreateFromConfigurableBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
-
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonCreateFromConfigurableBlock();
 //        $this->assertSame('Copy From Configurable', $result->getLabel());
 //        $this->assertSame('superProduct.createNewProduct()', $result->getOnClick());
diff --git a/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
index e0ad409884a..71a33508f54 100644
--- a/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Newsletter/Queue/EditTest.php
@@ -52,7 +52,7 @@ public function testGetButtonBackBlock(): void
 
         $result = self::$subject->getButtonBackBlock();
         $this->assertSame('Back', $result->getLabel());
-        $this->assertStringStartsWith('window.location.href = ', $result->getOnClick());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
         $this->assertSame('back', $result->getClass());
     }
 
diff --git a/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
index b6374c7910f..7636f4c39e9 100644
--- a/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Newsletter/Template/EditTest.php
@@ -52,7 +52,7 @@ public function testGetButtonBackBlock(): void
 
         $result = self::$subject->getButtonBackBlock();
         $this->assertSame('Back', $result->getLabel());
-        $this->assertStringStartsWith("window.location.href = '", $result->getOnClick());
+        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
         $this->assertSame('back', $result->getClass());
     }
 
diff --git a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
index a7d134783b6..53d06ebef25 100644
--- a/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/ItemsTest.php
@@ -25,19 +25,19 @@
 
 class ItemsTest extends TestCase
 {
-    private static ?Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items $subject;
+//    private static ?Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
-        Mage::register('current_creditmemo', new Mage_Sales_Model_Order_Creditmemo());
-
-        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items();
+//        Mage::app();
+//        Mage::register('current_creditmemo', new Mage_Sales_Model_Order_Creditmemo());
+//
+//        self::$subject = new Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items();
     }
 
     public static function tearDownAfterClass(): void
     {
-        self::$subject = null;
+//        self::$subject = null;
     }
 
     /**
@@ -52,9 +52,10 @@ public static function tearDownAfterClass(): void
      */
     public function testGetButtonUpdateBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonUpdateBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
@@ -73,9 +74,10 @@ public function testGetButtonUpdateBlock(): void
      */
     public function testGetButtonRefundBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonRefundBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
@@ -93,9 +95,10 @@ public function testGetButtonRefundBlock(): void
      */
     public function getButtonRefundOfflineBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonRefundOfflineBlock();
 //        $this->assertSame('Update Qty\'s', $result->getLabel());
 //        $this->assertStringStartsWith("submitAndReloadArea($('creditmemo_item_container'),'", $result->getOnClick());
diff --git a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
index 61d3991c233..8d47d442396 100644
--- a/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Tax/Rate/Toolbar/SaveTest.php
@@ -24,17 +24,17 @@
 
 class SaveTest extends TestCase
 {
-    private static ?Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $subject;
+//    private static ?Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
-        self::$subject = new Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save();
+//        Mage::app();
+//        self::$subject = new Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save();
     }
 
     public static function tearDownAfterClass(): void
     {
-        self::$subject = null;
+//        self::$subject = null;
     }
 
     /**
@@ -49,9 +49,10 @@ public static function tearDownAfterClass(): void
      */
     public function testGetButtonBackBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonBackBlock();
 //        $this->assertSame('Back', $result->getLabel());
 //        $this->assertStringStartsWith('window.location.href=', $result->getOnClick());
@@ -70,9 +71,10 @@ public function testGetButtonBackBlock(): void
      */
     public function testGetButtonDeleteBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonDeleteBlock();
 //        $this->assertSame('Delete Rate', $result->getLabel());
 //        $this->assertStringStartsWith('setLocation(', $result->getOnClick());
@@ -91,9 +93,10 @@ public function testGetButtonDeleteBlock(): void
      */
     public function testGetButtonResetBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonResetBlock();
 //        $this->assertSame('Reset', $result->getLabel());
 //        $this->assertSame('window.location.reload()', $result->getOnClick());
@@ -112,9 +115,10 @@ public function testGetButtonResetBlock(): void
      */
     public function testGetButtonSaveBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonSaveBlock();
 //        $this->assertSame('Save Rate', $result->getLabel());
 //        $this->assertSame('window.location.reload()', $result->getOnClick());
diff --git a/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php b/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
index 8f00ec48552..939c84033ec 100644
--- a/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Urlrewrite/EditTest.php
@@ -36,7 +36,11 @@ public static function setUpBeforeClass(): void
         if (!Mage::registry('current_product')) {
             Mage::register('current_product', new Mage_Catalog_Model_Product());
         }
-        Mage::register('current_category', new Mage_Catalog_Model_Category());
+
+        if (!Mage::registry('current_category')) {
+            Mage::register('current_category', new Mage_Catalog_Model_Category());
+        }
+
         Mage::register('current_urlrewrite', new Mage_Core_Model_Url_Rewrite());
 
         self::$subject = new Mage_Adminhtml_Block_Urlrewrite_Edit();
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index ceb99031c82..001a7ba1032 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -24,17 +24,17 @@
 
 class LinksTest extends TestCase
 {
-    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links $subject;
+//    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
-        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links();
+//        Mage::app();
+//        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links();
     }
 
     public static function tearDownAfterClass(): void
     {
-        self::$subject = null;
+//        self::$subject = null;
     }
 
     /**
@@ -48,9 +48,10 @@ public static function tearDownAfterClass(): void
      */
     public function testGetButtonAddBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonAddBlock();
 //        $this->assertSame('add_link_item', $result->getId());
 //        $this->assertSame('Add New Row', $result->getLabel());
diff --git a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index f603889634b..ace3dde9578 100644
--- a/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/tests/unit/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -24,17 +24,17 @@
 
 class SamplesTest extends TestCase
 {
-    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples $subject;
+//    private static ?Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples $subject;
 
     public static function setUpBeforeClass(): void
     {
-        Mage::app();
-        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples();
+//        Mage::app();
+//        self::$subject = new Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples();
     }
 
     public static function tearDownAfterClass(): void
     {
-        self::$subject = null;
+//        self::$subject = null;
     }
 
     /**
@@ -48,9 +48,10 @@ public static function tearDownAfterClass(): void
      */
     public function testGetButtonUploadBlock(): void
     {
-        self::$subject->setLayout(new Mage_Core_Model_Layout());
         $this->markTestIncomplete();
 
+//        self::$subject->setLayout(new Mage_Core_Model_Layout());
+//
 //        $result = self::$subject->getButtonUploadBlock();
 //        $this->assertSame('', $result->getId());
 //        $this->assertSame('Upload Files', $result->getLabel());
diff --git a/tests/unit/Mage/Uploader/Block/MultipleTest.php b/tests/unit/Mage/Uploader/Block/MultipleTest.php
index 3864ed7f36d..3c4eb8195a7 100644
--- a/tests/unit/Mage/Uploader/Block/MultipleTest.php
+++ b/tests/unit/Mage/Uploader/Block/MultipleTest.php
@@ -38,6 +38,7 @@ public static function tearDownAfterClass(): void
     }
 
     /**
+     * @covers Mage_Uploader_Block_Multiple::getButtonUploadBlock()
      * @group Mage_Uploader
      * @group Mage_Uploader_Block
      * @group AdminhtmlButtons

From 92c4f3a62a53c6d11e87542ac8219e42cb2bebd2 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 13:47:49 +0100
Subject: [PATCH 09/10] phpcsfixer

---
 app/code/core/Mage/Adminhtml/Block/Template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index b29f3913bd4..2cbd2bbfd0c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -132,8 +132,8 @@ private function createWidgetButtonBlockByType(string $type, string $name = '',
                 $button->setOnClick('window.close()');
                 break;
             case static::BUTTON_DELETE:
-                 $button->setLabel(Mage::helper('adminhtml')->__('Delete'));
-                 $button->setClass(static::BUTTON__CLASS_DELETE);
+                $button->setLabel(Mage::helper('adminhtml')->__('Delete'));
+                $button->setClass(static::BUTTON__CLASS_DELETE);
                 break;
             case static::BUTTON_REFRESH:
                 $button->setLabel(Mage::helper('adminhtml')->__('Refresh'));

From 4ec474f0f90de05a959419bbac3435a9d18becc2 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 7 Dec 2024 14:16:49 +0100
Subject: [PATCH 10/10] rector

---
 .../Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
index f02f843e735..15d0582a3c2 100644
--- a/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Catalog/Category/Edit/FormTest.php
@@ -55,6 +55,7 @@ public static function tearDownAfterClass(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonDeleteBlock(): void
     {
@@ -76,6 +77,7 @@ public function testGetButtonDeleteBlock(): void
      * @group AdminhtmlButtons
      * @group runInSeparateProcess
      * @runInSeparateProcess
+     * @doesNotPerformAssertions
      */
     public function testGetButtonDeleteResetBlock(): void
     {