From b87e6e02a8f811861ebf0097bad1d07484173b3e Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Thu, 15 Sep 2016 18:56:40 +0530
Subject: [PATCH] [IMP] general: Place (Un)Archive button as last button by
 default

PURPOSE
=======

Usability Issue of  "Archived" button. People tend to click on it accidentally

+ Also rename `Unarchive` into `Restore`
---
 addons/account/views/partner_view.xml                |  8 ++++----
 .../account_analytic_default/views/product_views.xml |  8 ++++----
 addons/analytic/views/analytic_account_views.xml     |  4 ++--
 addons/crm/views/crm_lead_views.xml                  | 10 +++++-----
 addons/crm/views/res_partner_views.xml               |  4 ++--
 addons/crm_project_issue/views/crm_lead_views.xml    |  2 +-
 addons/delivery/views/delivery_view.xml              |  6 +++---
 addons/event/views/event_views.xml                   | 10 +++++-----
 addons/fleet/views/fleet_view.xml                    |  6 +++---
 addons/hr_contract/views/hr_contract_views.xml       |  2 +-
 addons/hr_holidays/views/hr_views.xml                |  4 ++--
 addons/hr_payroll/views/hr_payroll_views.xml         |  4 ++--
 addons/hr_timesheet/project_timesheet_view.xml       |  2 +-
 .../views/hr_timesheet_sheet_views.xml               |  4 ++--
 addons/lunch/views/lunch_views.xml                   |  2 +-
 addons/mass_mailing/views/mass_mailing_views.xml     |  8 ++++----
 addons/mrp/views/mrp_workcenter_views.xml            |  8 ++++----
 addons/mrp/views/product_views.xml                   |  8 ++++----
 addons/procurement/views/product_views.xml           |  4 ++--
 addons/product/views/product_template_views.xml      |  4 ++--
 addons/project/views/project_views.xml               |  2 +-
 addons/project/views/res_partner_views.xml           |  4 ++--
 addons/project_issue/views/res_partner_views.xml     |  4 ++--
 addons/purchase/views/purchase_views.xml             |  4 ++--
 addons/purchase/views/res_partner_views.xml          |  8 ++++----
 addons/rating_project/views/project_view.xml         |  2 +-
 .../views/project_issue_view.xml                     |  2 +-
 addons/sale/views/res_partner_views.xml              |  4 ++--
 addons/sale/views/sale_views.xml                     |  8 ++++----
 addons/sale_crm/views/crm_lead_views.xml             |  4 ++--
 addons/sale_timesheet/views/project_task_views.xml   |  2 +-
 addons/stock/views/product_views.xml                 |  8 ++++----
 addons/stock/views/stock_location_views.xml          |  6 +++---
 addons/stock/views/stock_warehouse_views.xml         |  8 ++++----
 addons/survey/views/survey_views.xml                 |  6 +++---
 addons/web/static/src/js/views/form_widgets.js       |  2 +-
 addons/web/static/src/js/views/list_view.js          |  2 +-
 addons/web_kanban/static/src/xml/web_kanban.xml      |  2 +-
 addons/website_blog/views/website_blog_views.xml     |  6 +++---
 addons/website_event/views/website_event_views.xml   |  4 ++--
 addons/website_event_track/views/event_views.xml     |  4 ++--
 .../views/website_event_track_views.xml              |  6 +++---
 addons/website_forum/views/res_users.xml             |  4 ++--
 addons/website_hr/views/hr_employee_views.xml        |  4 ++--
 addons/website_partner/views/res_partner_views.xml   |  4 ++--
 addons/website_sale/views/views.xml                  |  4 ++--
 .../views/website_sale_delivery_views.xml            |  4 ++--
 .../views/website_sale_digital_view.xml              |  8 ++++----
 .../website_slides/view/website_slides_backend.xml   | 12 ++++++------
 49 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index 025be73ab0e..cefe1c78d51 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -95,7 +95,7 @@
             <field name="priority" eval="20"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button type="object"
                         class="oe_stat_button"
                         id="invoice_button"
@@ -108,7 +108,7 @@
                             <span class="o_stat_text">Invoiced</span>
                         </div>
                     </button>
-                </div>
+                </button>
                 <group name="container_row_2" position="inside">
                     <group string="Payments" name="banks">
                         <field name="currency_id" invisible="1"/>
@@ -140,12 +140,12 @@
             <field name="priority" eval="22"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d"
                         icon="fa-book" groups="analytic.group_analytic_accounting">
                         <field string="Analytic Accounts" name="contracts_count" widget="statinfo"/>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
diff --git a/addons/account_analytic_default/views/product_views.xml b/addons/account_analytic_default/views/product_views.xml
index d2ccb74361d..790b45d36d6 100644
--- a/addons/account_analytic_default/views/product_views.xml
+++ b/addons/account_analytic_default/views/product_views.xml
@@ -5,12 +5,12 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button name= "%(action_product_default_list)d" class="oe_stat_button" type="action" 
                         groups="analytic.group_analytic_accounting" icon="fa-bookmark-o">
                         <field name="rules_count" string="Analytic Rules" widget="statinfo" />
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
@@ -19,12 +19,12 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button name= "action_view_rules" class="oe_stat_button" type="object" 
                         groups="analytic.group_analytic_accounting" icon="fa-bookmark-o">
                         <field name="rules_count" string="Analytic Rules" widget="statinfo" />
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 </odoo>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index 927470cb6d9..94362e6d021 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -84,12 +84,12 @@
                 <form string="Analytic Account">
                     <sheet string="Analytic Account">
                         <div class="oe_button_box" name="button_box">
+                            <button class="oe_stat_button" type="action" name="%(account_analytic_line_action)d"
+                            icon="fa-usd"  string="Cost/Revenue" widget="statinfo"/>
                             <button class="oe_stat_button" type="object" name="toggle_active" icon="fa-archive">
                                 <field name="active" widget="boolean_button"
                                 options='{"terminology": "archive"}'/>
                             </button>
-                            <button class="oe_stat_button" type="action" name="%(account_analytic_line_action)d"
-                        icon="fa-usd"  string="Cost/Revenue" widget="statinfo"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index f3071eb0a6c..33e28608664 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -262,7 +262,7 @@
                                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                                         <t t-if="widget.editable"><li><a type="edit">Edit</a></li></t>
                                         <t t-if="widget.deletable"><li><a type="delete">Delete</a></li></t>
-                                        <li t-if="! record.active.value"><a name="action_set_active" type="object">Unarchive</a></li>
+                                        <li t-if="! record.active.value"><a name="action_set_active" type="object">Restore</a></li>
                                         <li t-if="record.active.value"><a name="action_set_unactive" type="object">Archive</a></li>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
@@ -371,10 +371,6 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive"
-                                    attrs="{'invisible': [('active', '=', True), ('probability', '&lt;', 100)]}">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button class="oe_stat_button" type="object"
                                 context="{'partner_id': partner_id}"
                                 name="action_schedule_meeting" icon="fa-calendar">
@@ -384,6 +380,10 @@
                                     <span class="o_stat_text" attrs="{'invisible': [('meeting_count', '&gt;', 1)]}"> Meeting</span>
                                 </div>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive"
+                                    attrs="{'invisible': [('active', '=', True), ('probability', '&lt;', 100)]}">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <div class="label label-danger pull-right" attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}">Lost</div>
                         <div class="label label-success pull-right" attrs="{'invisible': [('probability', '&lt;', 100)]}">Won</div>
diff --git a/addons/crm/views/res_partner_views.xml b/addons/crm/views/res_partner_views.xml
index d11162a3563..08541cb35a1 100644
--- a/addons/crm/views/res_partner_views.xml
+++ b/addons/crm/views/res_partner_views.xml
@@ -108,7 +108,7 @@
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <data>
-                    <div name="button_box" position="inside">
+                    <button name="toggle_active" position="before">
                         <button class="oe_stat_button o_res_partner_tip_opp" type="action"
                             attrs="{'invisible': [('customer', '=', False)]}"
                             name="%(crm.crm_lead_opportunities)d"
@@ -127,7 +127,7 @@
                             icon="fa-clock-o">
                             <field string="Activities" name="activities_count" widget="statinfo"/>
                         </button>
-                    </div>
+                    </button>
                 </data>
             </field>
         </record>
diff --git a/addons/crm_project_issue/views/crm_lead_views.xml b/addons/crm_project_issue/views/crm_lead_views.xml
index 748529ed576..ff92a4d52c3 100644
--- a/addons/crm_project_issue/views/crm_lead_views.xml
+++ b/addons/crm_project_issue/views/crm_lead_views.xml
@@ -7,7 +7,7 @@
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_leads" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='button_box']" position="inside">
+            <xpath expr="//button[@name='toggle_active']" position="before">
                     <button class="oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug" help="Convert to Issue">
                         <div class="o_form_field o_stat_info">
                             <span class="o_stat_text">Convert To</span>
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 7758b26a914..304f1b9cf25 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -38,9 +38,6 @@
                 <form string="Carrier">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "active"}'/>
-                            </button>
                             <button name="toggle_prod_environment" type="object" class="oe_stat_button" icon="fa-check-square" attrs="{'invisible': ['|', ('delivery_type', '=', 'fixed'), ('delivery_type', '=', 'base_on_rule')]}">
                                 <field name="prod_environment" widget="boolean_button" options='{"terminology": {
                                     "string_true": "Production Environment",
@@ -49,6 +46,9 @@
                                     "hover_false": "Switch to production environment"
                                 }}'/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "active"}'/>
+                            </button>
                         </div>
                         <div class="oe_title" name="title">
                             <label for="name" string="Name" class="oe_edit_only"/>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 0eb0e01b9d3..2af2a8743ba 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -68,11 +68,6 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box" groups="base.group_user">
-                            <button name="toggle_active" type="object"
-                                    class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button"
-                                    options='{"terminology": "archive"}'/>
-                            </button>
                             <button name="%(event.act_event_registration_from_event)d"
                                 type="action"
                                 class="oe_stat_button oe_event_attendee_button"
@@ -80,6 +75,11 @@
                                 help="Register with this event">
                                 <field name="seats_expected" widget="statinfo" string="Attendees"/>
                             </button>
+                            <button name="toggle_active" type="object"
+                                    class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button"
+                                    options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
diff --git a/addons/fleet/views/fleet_view.xml b/addons/fleet/views/fleet_view.xml
index e89023591e7..1a2455f0f22 100644
--- a/addons/fleet/views/fleet_view.xml
+++ b/addons/fleet/views/fleet_view.xml
@@ -190,9 +190,6 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button name="return_action_to_open"
                                 type="object"
                                 class="oe_stat_button"
@@ -233,6 +230,9 @@
                                 help="show the odometer logs for this vehicle" >
                                 <field name="odometer_count" widget="statinfo" string="Odometer"/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <field name="image_medium" widget='image' class="oe_avatar"/>
                         <div class="oe_title">
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index 28ca3af545d..7e2c77e8992 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -15,7 +15,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//div[@name='button_box']" position="inside">
+                    <xpath expr="//button[@name='toggle_active']" position="before">
                         <button name="%(act_hr_employee_2_hr_contract)d"
                             class="oe_stat_button"
                             icon="fa-book"
diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml
index ff311d8a0b2..1fd5b84f7de 100644
--- a/addons/hr_holidays/views/hr_views.xml
+++ b/addons/hr_holidays/views/hr_views.xml
@@ -130,7 +130,7 @@
                     </div>
                 </group>
             </xpath>
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <field name="show_leaves" invisible="1"/>
                 <button name="%(act_hr_employee_holiday_request)d"
                         type="action"
@@ -141,7 +141,7 @@
                         help="Remaining leaves">
                     <field string="Leaves Left" name="leaves_count" widget="statinfo"/>
                 </button>
-            </div>
+            </button>
         </field>
     </record>
 
diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml
index d074532e20a..80c61fcb6e3 100644
--- a/addons/hr_payroll/views/hr_payroll_views.xml
+++ b/addons/hr_payroll/views/hr_payroll_views.xml
@@ -385,14 +385,14 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                    <div name="button_box" position="inside">
+                    <button name="toggle_active" position="before">
                         <button name="%(act_hr_employee_payslip_list)d"
                             class="oe_stat_button"
                             icon="fa-money"
                             type="action">
                             <field name="payslip_count" widget="statinfo" string="Payslips"/>
                         </button>
-                    </div>
+                    </button>
             </field>
         </record>
         <!-- Salary Category-->
diff --git a/addons/hr_timesheet/project_timesheet_view.xml b/addons/hr_timesheet/project_timesheet_view.xml
index b9a7ec32cf7..0bfa5f19195 100644
--- a/addons/hr_timesheet/project_timesheet_view.xml
+++ b/addons/hr_timesheet/project_timesheet_view.xml
@@ -79,7 +79,7 @@
             <field name="inherit_id" ref="project.view_task_form2" />
             <field name="groups_id" eval="[(4, ref('base.group_user'))]"/>
             <field name="arch" type="xml">
-                <button name="toggle_active" position="after">
+                <button name="toggle_active" position="before">
                     <button name="%(act_project_task_sub_task)d" type="action" class="oe_stat_button" icon="fa-tasks"
                             attrs="{'invisible' : [('subtask_project_id', '=', False)]}"
                             context="{'project_id': subtask_project_id, 'name': name, 'partner_id': partner_id}" >
diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
index 4b39351560a..ff0f856ebcf 100644
--- a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
@@ -233,7 +233,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button name="%(act_hr_employee_2_hr_timesheet)d"
                         type="action"
                         class="oe_stat_button"
@@ -241,7 +241,7 @@
                         groups="hr_timesheet.group_hr_timesheet_user">
                         <field name="timesheet_count" widget="statinfo" string="Timesheets"/>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 609e4212ecc..f27a8906316 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -414,7 +414,7 @@
         </record>
 
         <record id="action_server_lunch_archive_product" model="ir.actions.server">
-            <field name="name">Archive/Unarchive</field>
+            <field name="name">Archive/Restore</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_lunch_product" />
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index ddd5e153696..e1f62390562 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -139,15 +139,15 @@
                 <form string="Contact List">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
+                            <button name="%(mass_mailing.action_view_mass_mailing_contacts_from_list)d"
+                                    type="action" icon="fa-user" class="oe_stat_button">
+                                <field name="contact_nbr" string="Recipients" widget="statinfo"/>
+                            </button>
                             <button name="toggle_active" type="object"
                                     class="oe_stat_button" icon="fa-archive">
                                 <field name="active" widget="boolean_button"
                                     options='{"terminology": "archive"}'/>
                             </button>
-                            <button name="%(mass_mailing.action_view_mass_mailing_contacts_from_list)d"
-                                    type="action" icon="fa-user" class="oe_stat_button">
-                                <field name="contact_nbr" string="Recipients" widget="statinfo"/>
-                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index e990d94d21c..76480c55ee1 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -255,10 +255,6 @@
                 <form string="Work Center">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button class="oe_stat_button" name="toggle_active" type="object" icon="fa-archive">
-                                <field name="active" widget="boolean_button"
-                                    options='{"terminology": "archive"}'/>
-                            </button>
                             <button name="%(mrp_workcenter_productivity_report_oee)d" type="action" class="oe_stat_button" icon="fa-pie-chart">
                                 <div class="o_form_field o_stat_info">
                                     <span class="o_stat_value"><field name="oee" widget="statinfo" nolabel="1"/>%</span>
@@ -283,6 +279,10 @@
                                     <span class="o_stat_text">Performance</span>
                                 </div>
                             </button>
+                            <button class="oe_stat_button" name="toggle_active" type="object" icon="fa-archive">
+                                <field name="active" widget="boolean_button"
+                                    options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <group>
                             <group>
diff --git a/addons/mrp/views/product_views.xml b/addons/mrp/views/product_views.xml
index aab72436df9..c5abc6c0bcb 100644
--- a/addons/mrp/views/product_views.xml
+++ b/addons/mrp/views/product_views.xml
@@ -44,7 +44,7 @@
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="groups_id" eval="[(4, ref('mrp.group_mrp_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(template_open_bom)d" type="action"
                         attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}" icon="fa-flask">
                         <field string="Bill of Materials" name="bom_count" widget="statinfo" />
@@ -53,7 +53,7 @@
                         attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}" icon="fa-list-alt">
                         <field string="Manufacturing" name="mo_count" widget="statinfo" />
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
@@ -63,7 +63,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="groups_id" eval="[(4, ref('mrp.group_mrp_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="action_view_bom" type="object"
                         attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}" icon="fa-flask">
                         <field string="Bill of Materials" name="bom_count" widget="statinfo" />
@@ -72,7 +72,7 @@
                         attrs="{'invisible':[('type', 'not in', ['product', 'consu'])]}" icon="fa-list-alt">
                         <field string="Manufacturing" name="mo_count" widget="statinfo" />
                     </button>
-                </div>
+                </button>
             </field>
         </record>
     </data>
diff --git a/addons/procurement/views/product_views.xml b/addons/procurement/views/product_views.xml
index 5031f71279d..e11fc82092a 100644
--- a/addons/procurement/views/product_views.xml
+++ b/addons/procurement/views/product_views.xml
@@ -7,7 +7,7 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                    <button class="oe_stat_button" name="%(procurement.procurement_order_action_product_template_stat)d"
                            icon="fa-truck" string="Procurements" type="action" 
                            groups="stock.group_adv_location" 
@@ -21,7 +21,7 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                    <button class="oe_stat_button" name="%(procurement.procurement_order_action_product_product_stat)d"
                            icon="fa-truck" string="Procurements" type="action" 
                            groups="stock.group_adv_location"
diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index 14f8a2c0b78..9d0aaa61ee1 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -33,14 +33,14 @@
                 <field name="barcode" attrs="{'invisible': [('product_variant_count', '>', 1)]}"/>
             </field>
 
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button name="%(product.product_variant_action)d" type="action"
                     icon="fa-sitemap" class="oe_stat_button"
                     attrs="{'invisible': [('product_variant_count', '&lt;=', 1)]}"
                     groups="product.group_product_variant">
                     <field string="Variants" name="product_variant_count" widget="statinfo" />
                 </button>
-            </div>
+            </button>
 
             <xpath expr="//page[@name='sales']" position="after">
                 <page name="variants" string="Variants" groups="product.group_product_variant">
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index b408c44c95f..f8a8ca18f14 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -540,7 +540,7 @@ action = model.activate_sample_project()
                     <field name="use_tasks" groups="base.group_no_one"/>
                     <label for="use_tasks" groups="base.group_no_one"/>
                 </xpath>
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                     <button class="oe_stat_button" type="object" name="projects_action"
                         icon="fa-puzzle-piece" attrs="{'invisible': [('project_count', '=', 0)]}">
                         <field string="Projects" name="project_count" widget="statinfo"/>
diff --git a/addons/project/views/res_partner_views.xml b/addons/project/views/res_partner_views.xml
index a838a87d732..d81016193e3 100644
--- a/addons/project/views/res_partner_views.xml
+++ b/addons/project/views/res_partner_views.xml
@@ -9,13 +9,13 @@
             <field name="priority" eval="50"/>
             <field name="groups_id" eval="[(4, ref('project.group_project_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action" name="%(action_view_task)d" 
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
                         icon="fa-tasks">
                         <field  string="Tasks" name="task_count" widget="statinfo"/>
                     </button>
-                </div>
+                </button>
             </field>
        </record>
 
diff --git a/addons/project_issue/views/res_partner_views.xml b/addons/project_issue/views/res_partner_views.xml
index 10aafb7d24f..4f6e0a12039 100644
--- a/addons/project_issue/views/res_partner_views.xml
+++ b/addons/project_issue/views/res_partner_views.xml
@@ -8,14 +8,14 @@
         <field name="priority" eval="50"/>
         <field name="groups_id" eval="[(4, ref('project.group_project_user'))]"/>
         <field name="arch" type="xml">
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" type="action" name="%(action_view_issues)d"
                     context="{'search_default_partner_id': commercial_partner_id, 'default_partner_id': active_id}"
                     attrs="{'invisible': [('customer', '=', False)]}"
                     icon="fa-bug">
                     <field name="issue_count" string="Issues" widget="statinfo"/>
                 </button>
-            </div>
+            </button>
         </field>
     </record>
 </odoo>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 4b612a8db97..6e8b74df99f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -610,12 +610,12 @@
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                    <button class="oe_stat_button" name="%(purchase.action_purchase_line_product_tree)d"
                        type="action" icon="fa-shopping-cart">
                        <field string="Purchases" name="purchase_count" widget="statinfo"/>
                    </button>
-                </div>
+                </button>
             </field>
         </record>
 
diff --git a/addons/purchase/views/res_partner_views.xml b/addons/purchase/views/res_partner_views.xml
index 0d9d340c097..e246a02b847 100644
--- a/addons/purchase/views/res_partner_views.xml
+++ b/addons/purchase/views/res_partner_views.xml
@@ -73,12 +73,12 @@
             <field name="priority" eval="20"/>
             <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-shopping-cart">
                         <field string="Purchases" name="purchase_order_count" widget="statinfo"/>
                     </button>
-                </div>
+                </button>
                 <page name="internal_notes" position="inside">
                     <group colspan="2" col="2" groups="purchase.group_warning_purchase">
                         <separator string="Warning on the Purchase Order" colspan="4"/>
@@ -97,12 +97,12 @@
             <field name="priority" eval="20"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o" help="Vendor Bills">
                         <field string="Vendor Bills." name="supplier_invoice_count" widget="statinfo"/>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 </odoo>
diff --git a/addons/rating_project/views/project_view.xml b/addons/rating_project/views/project_view.xml
index f220eb39fba..56eb64cfc93 100644
--- a/addons/rating_project/views/project_view.xml
+++ b/addons/rating_project/views/project_view.xml
@@ -19,7 +19,7 @@
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                     <button name="%(rating_rating_action_task)d" type="action"
                             attrs="{'invisible': [('rating_count', '=', 0)]}"
                             class="oe_stat_button" icon="fa-smile-o">
diff --git a/addons/rating_project_issue/views/project_issue_view.xml b/addons/rating_project_issue/views/project_issue_view.xml
index 3fcf251cc82..d3b39350354 100644
--- a/addons/rating_project_issue/views/project_issue_view.xml
+++ b/addons/rating_project_issue/views/project_issue_view.xml
@@ -19,7 +19,7 @@
             <field name="model">project.issue</field>
             <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                     <button name="%(rating_rating_action_issue)d" type="action"
                             class="oe_stat_button" icon="fa-smile-o">
                         <field name="rating_count" string="Rating" widget="statinfo"/>
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index c35944ff312..775a5fb78f7 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -42,13 +42,13 @@
             <field name="priority" eval="20"/>
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
                         attrs="{'invisible': [('customer', '=', False)]}"
                         icon="fa-usd">
                         <field string="Sales" name="sale_order_count" widget="statinfo"/>
                     </button>     
-                </div>
+                </button>
                 <page name="internal_notes" position="inside">
                     <group colspan="2" col="2" groups="sale.group_warning_sale">
                         <separator string="Warning on the Sales Order" colspan="4" />
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index e428d4d14a8..e0bd0c22985 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -584,12 +584,12 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(action_product_sale_list)d"
                         type="action" icon="fa-usd">
                         <field string="Sales" name="sales_count" widget="statinfo" />
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
@@ -599,12 +599,12 @@
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="action_view_sales"
                         type="object" icon="fa-usd">
                         <field string="Sales" name="sales_count" widget="statinfo" />
                     </button>
-                </div>
+                </button>
                 <group name="description" position="after">
                     <group string="Warning when Selling this Product" colspan="2" groups="sale.group_warning_sale">
                         <field name="sale_line_warn" nolabel="1"/>
diff --git a/addons/sale_crm/views/crm_lead_views.xml b/addons/sale_crm/views/crm_lead_views.xml
index bf39a04d001..a85f89b796a 100644
--- a/addons/sale_crm/views/crm_lead_views.xml
+++ b/addons/sale_crm/views/crm_lead_views.xml
@@ -19,7 +19,7 @@
                                   'default_partner_id': partner_id,
                                   'default_team_id': team_id}"/>
                 </xpath>
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action"
                             name="%(sale_action_quotations)d" icon="fa-pencil-square-o"
                             context="{'default_partner_id': partner_id, 'search_default_draft': 1}">
@@ -36,7 +36,7 @@
                             <span class="o_stat_text"> Orders</span>
                         </div>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 6b4f7dc435d..e1810c3f646 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -6,7 +6,7 @@
             <field name="groups_id" eval="[(4, ref('base.group_user'))]"/>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//button[@name='toggle_active']" position="before">
                     <button type="object" name="action_view_so"
                             class="oe_stat_button" icon="fa-dollar"
                             attrs="{'invisible': [('sale_line_id', '=', False)]}"
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index f7276259634..f1e588c096f 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -255,7 +255,7 @@
                             name="%(stock.act_make_procurement)d"
                             attrs="{'invisible': [('type', '!=', 'product')]}"/>
                     </header>
-                    <div name="button_box" position="inside">
+                    <button name="toggle_active" position="before">
                         <button class="oe_stat_button"
                                name="%(product_open_quants)d"
                                icon="fa-building-o"
@@ -304,7 +304,7 @@
                             name="action_view_routes"
                             attrs="{'invisible':[('type', '!=', 'product')]}"
                             class="oe_stat_button" icon="fa-cogs" groups="stock.group_adv_location"/>
-                    </div>
+                    </button>
                 </data>
             </field>
         </record>
@@ -319,7 +319,7 @@
                         <button name="%(action_view_change_product_quantity)d" string="Update Qty On Hand" type="action" attrs="{'invisible': [('type', '!=', 'product')]}"/>
                         <button string="Procurement Request" name="%(stock.act_make_procurement)d" type="action" attrs="{'invisible': [('type', '!=', 'product')]}"/>
                     </header>
-                    <div name="button_box" position="inside">
+                    <button name="toggle_active" position="before">
                         <button type="object"
                             name="action_open_quants"
                             attrs="{'invisible':[('type', '!=', 'product')]}"
@@ -369,7 +369,7 @@
                             attrs="{'invisible':[('type', '!=', 'product')]}"
                             class="oe_stat_button" icon="fa-cogs"
                             groups="stock.group_adv_location"/>
-                    </div>
+                    </button>
                 </data>
             </field>
         </record>
diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml
index c97cf919a75..cd7e6afe5a0 100644
--- a/addons/stock/views/stock_location_views.xml
+++ b/addons/stock/views/stock_location_views.xml
@@ -14,9 +14,6 @@
         <field name="arch" type="xml">
             <form string="Stock Location" create="false">
                 <div class="oe_button_box" name="button_box">
-                   <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                        <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                    </button>
                     <button string="Current Stock"
                             class="oe_stat_button"
                             icon="fa-building-o" name="%(location_open_quants)d" type="action"
@@ -26,6 +23,9 @@
                             icon="fa-filter" name="%(act_product_location_open)d" type="action"
                             context="{'location_id': active_id}"
                             />
+                   <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                        <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                    </button>
                 </div>
                 <label for="name" class="oe_edit_only"/>
                 <h1><field name="name"/></h1>
diff --git a/addons/stock/views/stock_warehouse_views.xml b/addons/stock/views/stock_warehouse_views.xml
index 8a3e646a693..9fa13559b69 100644
--- a/addons/stock/views/stock_warehouse_views.xml
+++ b/addons/stock/views/stock_warehouse_views.xml
@@ -8,14 +8,14 @@
                 <form string="Warehouse" create="false">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button name="action_view_all_routes"
                                     string="Routes"
                                     icon="fa-refresh"
                                     class="oe_stat_button"
                                     type="object"/>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
@@ -169,10 +169,10 @@
                 <form string="Reordering Rules">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
+                            <button name="%(stock.do_view_procurement_op)d" type="action" string="Procurements" class="oe_stat_button" icon="fa-refresh"/>
                             <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
                                 <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
                             </button>
-                            <button name="%(stock.do_view_procurement_op)d" type="action" string="Procurements" class="oe_stat_button" icon="fa-refresh"/>
                         </div>
                         <group>
                             <group>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index b57b5be66c0..181c7d48550 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -126,15 +126,15 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive" attrs="{'invisible': [('is_closed', '=', False)]}">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button name="action_survey_user_input"
                                 type="object"
                                 class="oe_stat_button"
                                 icon="fa-pencil-square-o">
                                 <field string="Answers" name="tot_comp_survey" widget="statinfo"/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive" attrs="{'invisible': [('is_closed', '=', False)]}">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <div class="oe_title" style="width: 100%;">
                             <label for="title" class="oe_edit_only"/>
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index bc649e65cbd..fdd6b071110 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -639,7 +639,7 @@ var FieldBooleanButton = common.AbstractField.extend({
                 this.string_true = _t("Active");
                 this.hover_true = _t("Archive");
                 this.string_false = _t("Archived");
-                this.hover_false = _t("Unarchive");
+                this.hover_false = _t("Restore");
                 break;
             default:
                 var terms = typeof this.options["terminology"] === 'string' ? {} : this.options["terminology"];
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 9382b255b01..54ee12f684a 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -287,7 +287,7 @@ var ListView = View.extend({
             this.sidebar.add_items('other', _.compact([
                 { label: _t("Export"), callback: this.on_sidebar_export },
                 this.fields_view.fields.active && {label: _t("Archive"), callback: this.do_archive_selected},
-                this.fields_view.fields.active && {label: _t("Unarchive"), callback: this.do_unarchive_selected},
+                this.fields_view.fields.active && {label: _t("Restore"), callback: this.do_unarchive_selected},
                 this.is_action_enabled('delete') && { label: _t('Delete'), callback: this.do_delete_selected }
             ]));
 
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index ccf69e15025..f303885c489 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -23,7 +23,7 @@
                     </t>
                     <t t-if="widget.has_active_field">
                         <li><a class="o_column_archive" href="#">Archive Records</a></li>
-                        <li><a class="o_column_unarchive" href="#">Unarchive Records</a></li>
+                        <li><a class="o_column_unarchive" href="#">Restore Records</a></li>
                     </t>
                 </ul>
             </span>
diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index 63a683dd130..533bb0f5987 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -60,13 +60,13 @@
                 <form string="Blog Post">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button class="oe_stat_button" name="website_publish_button"
                                 type="object" icon="fa-globe">
                                 <field name="website_published" widget="website_button"/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <group>
                             <field name="blog_id"/>
diff --git a/addons/website_event/views/website_event_views.xml b/addons/website_event/views/website_event_views.xml
index 67c1003c220..7273aba2878 100644
--- a/addons/website_event/views/website_event_views.xml
+++ b/addons/website_event/views/website_event_views.xml
@@ -7,13 +7,13 @@
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
             <!-- add state field in header -->
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <field name="website_url" invisible="1"/>
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
                 </button>
-            </div>
+            </button>
             <xpath expr="//field[@name='organizer_id']" position="after">
                 <field name="twitter_hashtag"/>
             </xpath>
diff --git a/addons/website_event_track/views/event_views.xml b/addons/website_event_track/views/event_views.xml
index 4b927f99876..aaee4c93266 100644
--- a/addons/website_event_track/views/event_views.xml
+++ b/addons/website_event_track/views/event_views.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button name="%(action_event_track_from_event)d"
                             type="action"
                             class="oe_stat_button"
@@ -20,7 +20,7 @@
                             icon="fa-users">
                         <field name="count_sponsor" widget="statinfo" string="Sponsors"/>
                     </button>
-                </div>
+                </button>
                 <xpath expr="//div[@class='oe_title']" position="inside">
                     <div name="event_checkboxes">
                         <field name="show_menu"/>
diff --git a/addons/website_event_track/views/website_event_track_views.xml b/addons/website_event_track/views/website_event_track_views.xml
index 5e92ab0a178..f10c2c12ce5 100644
--- a/addons/website_event_track/views/website_event_track_views.xml
+++ b/addons/website_event_track/views/website_event_track_views.xml
@@ -96,14 +96,14 @@
                     </header>
                     <sheet string="Track">
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <field name="website_url" invisible="1"/>
                             <button class="oe_stat_button" name="website_publish_button"
                                 type="object" icon="fa-globe">
                                 <field name="website_published" widget="website_button"/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
diff --git a/addons/website_forum/views/res_users.xml b/addons/website_forum/views/res_users.xml
index ef40388d7de..7711e743779 100644
--- a/addons/website_forum/views/res_users.xml
+++ b/addons/website_forum/views/res_users.xml
@@ -11,12 +11,12 @@
                 <field name="signature" position="after">
                     <field name="karma" string="Forum Karma"/>
                 </field>
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="open_website_url"
                         type="object" icon="fa-globe">
                         <field name="website_published" widget="website_button"/>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
 
diff --git a/addons/website_hr/views/hr_employee_views.xml b/addons/website_hr/views/hr_employee_views.xml
index 258a611d6cf..b17a27fc009 100644
--- a/addons/website_hr/views/hr_employee_views.xml
+++ b/addons/website_hr/views/hr_employee_views.xml
@@ -6,12 +6,12 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_form"/>
         <field name="arch" type="xml">
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
                 </button>
-            </div>
+            </button>
             <xpath expr="//page[@name='public']/group" position="inside">
                 <group>
                     <field name="public_info"/>
diff --git a/addons/website_partner/views/res_partner_views.xml b/addons/website_partner/views/res_partner_views.xml
index 45cec43b4c4..a83efe74c21 100644
--- a/addons/website_partner/views/res_partner_views.xml
+++ b/addons/website_partner/views/res_partner_views.xml
@@ -7,12 +7,12 @@
         <field eval="18" name="priority"/>
         <field name="arch" type="xml">
             <data>
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="website_publish_button"
                         type="object" icon="fa-globe">
                         <field name="website_published" widget="website_button"/>
                     </button>
-                </div>
+                </button>
             </data>
         </field>
     </record>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 7213f77140f..eab192f3ce6 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -28,12 +28,12 @@
                     <field name="website_style_ids" widget="many2many_tags" groups="base.group_no_one"/>
                 </group>
             </group>
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
                 </button>
-            </div>
+            </button>
             <xpath expr="//notebook[last()]" position="inside">
                 <page string="Images" groups="website_sale.group_website_multi_image">
                     <field name="product_image_ids" mode="kanban" context="{'default_name': name, 'default_product_tmpl_id': active_id}">
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
index 73ec58e7a81..19e4a007379 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
@@ -6,11 +6,11 @@
         <field name="model">delivery.carrier</field>
         <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
         <field name="arch" type="xml">
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" name="website_publish_button" type="object" icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
                 </button>
-            </div>
+            </button>
             <div name="title" position="after">
                 <group name="website">
                     <field name="website_description" string="Description" placeholder="Description displayed on the eCommerce and on online quotations."/>
diff --git a/addons/website_sale_digital/views/website_sale_digital_view.xml b/addons/website_sale_digital/views/website_sale_digital_view.xml
index 8cc8a8cf8c6..7a1db11731f 100644
--- a/addons/website_sale_digital/views/website_sale_digital_view.xml
+++ b/addons/website_sale_digital/views/website_sale_digital_view.xml
@@ -5,11 +5,11 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_only_form_view" />
         <field name="arch" type="xml">
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" name="action_open_attachments" type="object" icon="fa-file">
                     <field string="File" name="attachment_count" widget="statinfo" />
                 </button>
-            </div>
+            </button>
         </field>
     </record>
 
@@ -18,11 +18,11 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
-             <div name="button_box" position="inside">
+             <button name="toggle_active" position="before">
                 <button class="oe_stat_button" name="action_open_attachments" type="object" icon="fa-file">
                     <field string="File" name="attachment_count" widget="statinfo" />
                 </button>
-            </div>
+            </button>
         </field>
     </record>
 </odoo>
diff --git a/addons/website_slides/view/website_slides_backend.xml b/addons/website_slides/view/website_slides_backend.xml
index c2a0a0eade6..85fdab556b0 100644
--- a/addons/website_slides/view/website_slides_backend.xml
+++ b/addons/website_slides/view/website_slides_backend.xml
@@ -41,13 +41,13 @@
                 <form string="Slide">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button class="oe_stat_button" name="website_publish_button"
                                     type="object" icon="fa-globe">
                                 <field name="website_published" widget="website_button"/>
                             </button>
+                            <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <field name="image" widget="image" class="oe_avatar" options='{"preview_image": "image_thumb"}' readonly="1"/>
                         <div class="oe_title">
@@ -201,13 +201,13 @@
                 <form string="Channels">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="toggle_active" type="object" confirm="(Un)archiving a channel automatically (un)archives its slides. Do you want to proceed?" class="oe_stat_button" icon="fa-archive">
-                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-                            </button>
                             <button class="oe_stat_button" name="website_publish_button"
                                     type="object" icon="fa-globe">
                                 <field name="website_published" widget="website_button"/>
                             </button>
+                            <button name="toggle_active" type="object" confirm="(Un)archiving a channel automatically (un)archives its slides. Do you want to proceed?" class="oe_stat_button" icon="fa-archive">
+                                <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                            </button>
                         </div>
                         <div class="oe_title">
                             <div class="oe_edit_only">