diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8254d5183be..9d8ade644c6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -143,17 +143,14 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                </header>
                 <sheet string="Supplier Invoice" layout="auto">
                     <group col="8" colspan="4" class="oe_form_header">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
@@ -259,7 +256,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                 	<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                 	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
@@ -269,11 +266,8 @@
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                </header>
                 <sheet string="Invoice" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fe1bafecde0..6eec7156d25 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -12,14 +12,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" />
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </header>
                 <sheet string="Fiscalyear" layout="auto">
                     <group class="oe_form_header">
                     <field name="name"/>
@@ -97,13 +94,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1"/>
+                </header>
                 <sheet string="Period" layout="auto">
                 <group class="oe_form_header">
                     <field name="name"/>
@@ -601,15 +595,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -666,15 +657,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -1361,14 +1349,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" />
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                </header>
                 <sheet string="Journal Entries" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" readonly="True"/>
@@ -2632,15 +2617,12 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
                     <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Statement" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 1cf1e40f02b..41a0b121735 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -16,10 +16,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Accounting" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <field name="has_default_company" invisible="1" />
                         <field name="has_chart_of_accounts" invisible="1"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 1affcf7a85c..5e1a5f68d95 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -83,10 +83,7 @@
                <button name="validate" states="draft" string="Confirm Asset" type="object"/>
                <button name="set_to_close" states="open" string="Set to Close" type="object"/>
                <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
-               <div class="oe_right">
-                   <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-               </div>
-               <div class="oe_clear"/>
+               <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
            </div>
            <sheet string="Asset" layout="auto">
               <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 13c97ca32d6..667d35a9d6d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -105,17 +105,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" />
                     <button string="Approve" name="validate" states="confirm" type="workflow"/>
                     <button string="Done" name="done" states="validate" type="workflow"   />
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Budget" layout="auto">
                 <group class="oe_form_header">
                             <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a85d4156cc4..892c8636caf 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -101,16 +101,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="open" states="draft" string="Confirm Payments" />
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
                     <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
+                </header>
                 <sheet string="Payment order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                       <field name="reference"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a1ff581006b..fe282138a72 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -40,16 +40,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                  <div class="oe_form_topbar">
+                  <header>
                       <button name="proforma_voucher" string="Post" states="draft"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
                       <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                       <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                      <div class="oe_right">
-                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                      </div>
-                      <div class="oe_clear"/>
-                  </div>
+                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </header>
                   <sheet string="Accounting Voucher" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5ceee46b2cd..f426b259ab6 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -144,16 +144,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
@@ -298,16 +295,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b3ba7c99cab..5134c55c2a8 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -81,17 +81,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
@@ -210,17 +207,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
                 <sheet string="Supplier Voucher" layout="auto">
                     <field name="pay_now" invisible="1"/>
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5975210a99c..e5e45c07d61 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
                             string="Uncertain" type="object"
@@ -26,11 +26,8 @@
                         <button name="do_decline" string="Decline"
                             states="needs-action,tentative,accepted"
                             type="object" />
-                        <div class="oe_right">
-                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
-                        </div>
-                        <div class="oe_clear"/>
-                    </div>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
+                    </header>
                     <sheet string="Invitation details" layout="auto">
                         <group col="6" colspan="4">
                             <field name="email" string="Invitation To"/>
@@ -214,7 +211,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="do_confirm"
                         string="Confirm"
                         states="tentative,cancelled"
@@ -230,11 +227,8 @@
                         states="tentative,confirmed"
                         type="object"
                         />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
                 <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index b0b533d78e1..0692b4f651c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -46,10 +46,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Configure Sales" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
-                </div>
+                </header>
                 <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0281263397a..ccf231924fe 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="General Settings" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Company Settings" colspan="4"/>
                         <field name="module_multi_company"/>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0b58975bca2..82bc50eafea 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -189,7 +189,7 @@ class crm_lead(base_stage, osv.osv):
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Name', size=64, select=1),
+        'name': fields.char('Subject', size=64, required=True, select=1),
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 07e295d4e4c..35180ebf937 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -61,7 +61,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity"/>
                     <button name="case_escalate" string="Escalate" type="object"
@@ -70,15 +70,12 @@
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
+                    <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                </header>
                 <sheet layout="auto">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Subject"/>
+                    <field name="name"/>
                     <field name="priority"/>
                     <field name="categ_id"
                         widget="selection"
@@ -171,7 +168,7 @@
                     <field name="needaction_pending" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
-                    <field name="name" string="Subject"/>
+                    <field name="name"/>
                     <field name="contact_name"/>
                     <field name="country_id" invisible="context.get('invisible_country', True)" />
                     <field name="email_from"/>
@@ -239,18 +236,15 @@
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
-                                <h3>
-                                    <field name="partner_id"/>
-                                    <t t-if="record.planned_revenue.raw_value">
-                                        - <t t-esc="Math.round(record.planned_revenue.value)"/>
-                                        <field name="company_currency"/>
-                                    </t>
-                                </h3>
                                 <div>
-                                    <b> <field name="partner_address_name"/> </b>
+                                    <b><field name="name"/></b>
+                                    <t t-if="record.planned_revenue.raw_value">
+                                        - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
+                                        <field name="company_currency"/></b>
+                                    </t>
                                 </div>
                                 <div>
-                                    <field name="name"/>
+                                    <field name="partner_id"/>
                                 </div>
                                 <div style="padding-left: 0.5em">
                                     <i>
@@ -376,134 +370,129 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="case_open" string="Open" type="object"
-                            states="draft"/>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,open"/>
-                    <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="draft,open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object"
-                            states="cancel"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2" width="auto">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
-                    <div class="oe_text_right">
+            <form string="Opportunities" validate="0">
+                <header>
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
+                <sheet>
+                    <div class="oe_right oe_form_button_box">
                         <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            name="%(opportunity2phonecall_act)d"
                             type="action"/>
-                        <button string="Schedule Meeting" icon="gtk-redo"
+                        <button string="Schedule Meeting"
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                </group>
-                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
-                    <field name="user_id"/>
-                    <field name="planned_revenue"/>
 
-                    <field name="date_action"/>
-                    <field name="date_deadline"/>
+                    <div class="oe_form_title">
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
 
-                    <field name="title_action"/>
-                    <field name="probability"/>
+                        <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                        <h2>
+                            <field name="planned_revenue" class="oe_form_inline"/>
+                            <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
+                            <field name="probability" class="oe_form_inline"/> %% success rate
+                        </h2>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                string="Customer"
+                                context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
+                            <field name="email_from" string="Email"/>
+                            <field name="phone"/>
+                        </group>
+
+                        <group>
+                            <label for="title_action"/>
+                            <div>
+                                <field name="date_action" nolabel="1"/> -
+                                <field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
+                            </div>
+                            <field name="date_deadline"/>
+                            <field name="priority"/>
+                        </group>
+
+                        <group>
+                            <field name="user_id"/>
+                            <field name="section_id" colspan="1" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="categ_id" select="1"
+                                string="Category" widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
 
-                    <field name="type" invisible="1"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <group colspan="2" col="3" class="oe_form_group_label_border">
-                            <field width="80%%" name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
-                            <button name="%(action_crm_lead2partner)d"
-                                icon="terp-partner" type="action"
-                                string="Create"
-                                attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                            <field name="phone" colspan="3"/>
-                            <field width="80%%" name="email_from" string="Email"/>
-                            <button string="Mail"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="terp-mail-message-new" type="action" />
                         </group>
                     </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="2" string="Category"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
-                            string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                        <field name="state"/>
-                        <field name="priority"/>
-                    </group>
 
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                </page>
-                <page string="Lead">
-                    <separator string="Contact" colspan="4"/>
-                    <group colspan="4" col="4" class="oe_form_group_label_border">
-                        <field name="partner_name" string="Customer Name" colspan="4"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="fax"/>
-                        <field name="street"/>
-                        <field name="zip"/>
-                        <field name="country_id"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <field name="function" />
-                        <field name="mobile"/>
-                        <field name="street2"/>
-                        <field name="city"/>
-                        <field name="state_id"/>
-                    </group>
+                                    <!--<button string="Mail"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail':'new', 'model': 'crm.lead'}"
+                                        icon="terp-mail-message-new" type="action" />-->
 
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                    </group>
-                    <group colspan="2" col="2" class="oe_form_group_label_border">
-                        <separator string="Mailings" colspan="2"/>
-                        <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                        <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
-                    </group>
-                </page>
-                <page string="Extra Info">
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open" groups="base.group_no_one"/>
-                        <field name="day_close" groups="base.group_no_one"/>
-                        <field name="referred"/>
-                    </group>
-                    <group col="2" colspan="2" class="oe_form_group_label_border">
-                        <separator colspan="4" string="References"/>
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                </page>
-                </notebook>
+                    <notebook colspan="4">
+                    <page string="Internal Notes">
+                        <field name="description"/>
+                    </page>
+                    <page string="Lead">
+                        <group>
+                            <group>
+                                <field name="partner_name"/>
+                                <label for="street" string="Address"/>
+                                <div>
+                                    <field name="street" placeholder="Street..."/>
+                                    <field name="street2"/>
+                                    <div>
+                                        <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
+                                        <field name="city" class="oe_form_inline" placeholder="City"/>
+                                    </div>
+                                    <field name="state_id" placeholder="State"/>
+                                    <field name="country_id" placeholder="Country"/>
+                                </div>
+                            </group>
+
+                            <group>
+                                <field name="contact_name" />
+                                <field name="function" />
+                                <field domain="[('domain', '=', 'contact')]" name="title"/>
+                                <field name="mobile"/>
+                                <field name="fax"/>
+                            </group>
+
+                            <group string="Categorization">
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
+                            </group>
+                            <group string="Mailings">
+                                <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
+                                <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="active"/>
+                                <field name="day_open" groups="base.group_no_one"/>
+                                <field name="day_close" groups="base.group_no_one"/>
+                                <field name="referred"/>
+                            </group>
+                            <group string="References">
+                                <field name="ref"/>
+                                <field name="ref2"/>
+                            </group>
+                        </group>
+                    </page>
+                    </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e7176386842..ea6f0bf7e43 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -26,7 +26,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings" layout="manual">
-                <div class="oe_form_topbar oe_form_topbar_hifirst">
+                <header>
                     <button name="case_open" string="Confirm" type="object"
                             states="draft"/>
                     <button name="case_close" string="Done" type="object"
@@ -35,11 +35,8 @@
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                </header>
                 <sheet layout="auto">
                 <group col="6" colspan="4">
                     <field name="name" select="1" string="Title"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6360e24a217..2e1c35e683a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -63,7 +63,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" type="object"
@@ -72,11 +72,8 @@
                         states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending" icon="gtk-cancel"/>
-                <div class="oe_right">
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" select="1"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
+            </header>
             <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 9c4f1361e7c..d0499bbdf6c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -2,40 +2,44 @@
 <openerp>
     <data>
 
-    	<!-- Opportunity to Phonecall view -->
+        <!-- Opportunity to Phonecall view -->
 
         <record model="ir.ui.view" id="opportunity2phonecall_view">
             <field name="name">crm.opportunity2phonecall.form</field>
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call">
-                 	<separator string="Schedule/Log a Call" colspan="4"/>
-                    <field name="action"/>
-                    <separator string="Call Details" colspan="4"/>
-                    <field name="name"/>
-                    <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
-                    <newline/>
-                    <field name="partner_id" readonly="True"/>
-                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="phone"/>
-                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    <separator string="Notes" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="3">
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                       	<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    </group>
+                <form string="Schedule/Log a Call" layout="manual">
+                <header>
+                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                </header>
+            <group>
+                <group>
+                <field name="action"/>
+                <field name="name"/>
+                <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+            </group>
+            <group>
+                <field name="partner_id" readonly="True"/>
+                <field name="categ_id" string="Type"
+                    widget="selection"
+                domain="[('object_id.model', '=', 'crm.phonecall')]"
+                groups="base.group_no_one"/>
+                <field name="phone"/>
+                <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+            </group>
+                </group>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
 
-		<!-- Opportunity to Phonecall action -->
+        <!-- Opportunity to Phonecall action -->
 
- 		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
+         <record model="ir.actions.act_window" id="opportunity2phonecall_act">
             <field name="name">Schedule/Log Call</field>
             <field name="res_model">crm.opportunity2phonecall</field>
             <field name="view_type">form</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9d0f8d950b0..4e49a0d9db8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -89,7 +89,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Done" type="object"
@@ -104,12 +104,9 @@
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"
+                    <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                </header>
                 <sheet string="Claims" layout="auto">
                     <group>
                         <field name="name" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b4ed0a38c43..02f85b1ad7f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -62,18 +62,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_close" string="Done" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" />
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
                 <sheet string="Funds Form" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1" string="Name"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fe9db30c274..d6b21ab9191 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -29,7 +29,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Close" type="object"
@@ -42,11 +42,8 @@
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
                 <sheet string="Helpdesk Support" layout="auto">
                     <group colspan="4" col="7" class="oe_form_header">
                         <field name="name" select="1" string="Query"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 8da4d623435..83f0e470c55 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,25 +10,28 @@
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation">
-                        <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
-                            <separator string="Partner Assignation" colspan="5"/>
-                            <field width="50%%" name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                            <field width="40%%" name="date_assign"/>
-                            <group width="10%%" colspan="1" col="1">
-                                <button string="Forward"
-                                    attrs="{'invisible':[('partner_assigned_id','=',False)]}"
-                                    name="%(crm_lead_forward_to_partner_act)d"
-                                    icon="terp-mail-forward" type="action"
-                                    context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
-                                />
+                            <group name="partner_assign_group">
+                                <group string="Partner Assignation">
+                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <label for="date_assign"/>
+                                    <div>
+                                        <field name="date_assign"/>
+                                        <button string="Forward"
+                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
+                                            name="%(crm_lead_forward_to_partner_act)d"
+                                            icon="terp-mail-forward" type="action"
+                                            context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
+                                        />
+                                    </div>
+                                </group>
+                                <group string="Geo Assignation">
+                                    <field name="partner_latitude"/>
+                                    <field name="partner_longitude"/>
+				    <span/>
+                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                                        icon="gtk-apply"/>
+                                </group>
                             </group>
-
-                            <separator string="Geo Assignation" colspan="5"/>
-                            <field width="50%%" name="partner_latitude"/>
-                            <field width="40%%" name="partner_longitude"/>
-                            <button width="10%%" string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                icon="gtk-apply"/>
-                        </group>
                         </page>
                     </xpath>
                 </data>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index a587463fedb..c7617f317b0 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
         <field name="arch" type="xml">
             <data>
-            <page string="Extra Info" position="before">
+            <page string="Lead" position="before">
                 <page string="Tasks">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree editable="bottom" string="Tasks">
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 10f12a63f4e..5eea9132f7c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -266,7 +266,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/div[@class='oe_form_topbar']/button[@string='Create Invoice']" position="after">
+                <header>
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bfa3b496aed..e5442b5ec5f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -51,16 +51,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Events" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
                     <button string="Event Ended" name="button_done" states="confirm" type="object"/>
                     <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                </header>
                 <sheet layout="manual">
 
 
@@ -355,16 +352,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="registration_open" string="Confirm" states="draft" type="object"/>
                     <button name="button_reg_close" string="Attended" states="open" type="object"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                </header>
                 <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 32eb3a84c83..461ba8fd71a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -346,15 +346,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
                     <button name="job_open" string="In Position" states="old,recruit" type="object"/>
                     <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
+                </header>
                 <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
                     <field name="name" />
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 739eaacdf79..e6b55ba45f0 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -15,10 +15,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string ="Configure Human Resources" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Additional Features" colspan="4"/>
                         <field name="module_hr_expense"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9611ec382e9..103c9f62722 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -155,17 +155,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
                     <button name="button_done" string="Done" states="progress" type="object"/>
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                </header>
                 <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
                         <separator string="Appraisal Data" colspan="4"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index edc6f0fd243..2fc1340fd23 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -64,17 +64,14 @@
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
                     <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                </header>
                 <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bbcec416aff..58abaae02ac 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -64,17 +64,14 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                </header>
                 <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
@@ -116,17 +113,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
+                </header>
                 <sheet string="Allocation Request" layout="auto">
                 <group col="8" colspan="4" class="oe_form_header">
                     <field name="name"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 93e875b61be..f2626670523 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -261,17 +261,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Confirm" name="hr_verify_sheet" states="draft"/>
                     <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
                     <button string="Set to Draft" name="draft" states="cancel"/>
                     <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Payslip" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
@@ -725,15 +722,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
                     <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar"/>
+                </header>
                 <sheet string="Payslips Batches" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" colspan="4"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 93a9d01107d..19039fc0dc9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -71,7 +71,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
                 <button name="case_open" string="Open" type="object"
@@ -86,11 +86,8 @@
                         states="open" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" type="object"
                         states="open" icon="gtk-go-forward"/>
-                <div class="oe_right">
-                    <field name="stage_id" nolabel="1" widget="statusbar"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="stage_id" widget="statusbar"/>
+            </header>
             <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="4">
                     <field name="name" string="Subject"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 43ca7a4004e..f9486982432 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -23,17 +23,14 @@
                     </group>
                 </group>
                 <xpath expr="/form/sheet" position='before'>
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="set_pending" string="Pending" type="object" states="open"/>
                         <button name="set_close" string="Close" type="object" states="open,pending"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
-                        <div class="oe_right">
-                            <field name="state" readonly="1" widget="statusbar" nolabel="1"
+                        <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
-                        </div>
-                        <div class="oe_clear"/>
-                    </div>
+                    </header>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa815df5337..afd04aed1e1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -61,16 +61,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
+                </header>
                 <sheet string="Timesheet" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index eacb0804658..0e9fb40020f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -183,15 +183,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="idea_open" string="Open" states="draft"/>
                 <button name="idea_close" string="Accept" states="open"/>
                 <button name="idea_cancel" string="Refuse" states="open" />
-                <div class="oe_right">
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
+            </header>
             <sheet string="New Idea" layout="auto">
             <group col="6" colspan="4" class="oe_form_header">
                 <field name="name" select="1" />
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 6816a9da3a1..d1debeaf562 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Wiki" colspan="4"/>
                         <field name="module_wiki_faq"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index aeb5eed5034..57360829e19 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -24,14 +24,11 @@
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
+                </header>
                 <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index b7230aa65a7..7a36956a9dc 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Marketing" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Campaigns" colspan="4"/>
                         <field name="module_marketing_campaign"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a8edeb81ca4..9be08469cf4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -16,16 +16,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Done" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
-                <div class="oe_right">
-                    <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
+            </header>
             <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
@@ -140,16 +137,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Close" states="running"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
-                <div class="oe_right">
-                    <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
+            </header>
             <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
                     <separator string="Segment" colspan="4"/>
@@ -364,15 +358,12 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
                 <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
-                <div class="oe_right">
-                    <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
+            </header>
             <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
                     <group colspan="2" col="2">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f856622c8a1..7c8410cad7f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -632,7 +632,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_confirm" states="draft" string="Confirm Production"/>
                     <button name="button_produce" states="ready" string="Start Production"/>
                     <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
@@ -640,11 +640,8 @@
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
+                </header>
                 <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
                         <field name="name" string="Reference"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8e5934b170a..258fe4f8356 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Manufacturing Order" colspan="4"/>
                         <field name="module_mrp_operations"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 73a74baa471..2ef70a9edf8 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -68,18 +68,15 @@
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="button_start_working" string="Start" states="draft"/>
                 <button name="button_resume" string="Resume" states="pause"/>
                 <button name="button_done" string="Finished" states="startworking"/>
                 <button name="button_pause" string="Pending" states="startworking"/>
                 <button name="button_draft" string="Set Draft" states="cancel"/>
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
-                <div class="oe_right">
-                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
+            </header>
             <sheet string="Work Orders" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
                     <field colspan="4" name="name" select="1"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index ff262329ce2..21e3dd5aa25 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -28,7 +28,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form layout="manual">
-               <div class="oe_form_topbar">
+               <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                    <button name="repair_ready" states="confirmed" string="Start Repair"/>
                    <button name="action_repair_start" states="ready" string="Start Repair"/>
@@ -40,11 +40,8 @@
                    <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
                    <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                    <button name="cancel" states="draft" string="Cancel Repair"/>
-                   <div class="oe_right">
-                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
-                   </div>
-                   <div class="oe_clear"/>
-               </div>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
+               </header>
                <sheet string="Repairs order" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
                     <field name="name"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index a83aab01ca9..670e10feec2 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -17,16 +17,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
+                </header>
                 <sheet string="PoS Orders" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 427b699e0f6..09bf0c6c24f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -47,16 +47,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="button_confirm" states="draft" string="Confirm"/>
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
                         <button name="button_restart" states="exception" string="Retry"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
-                        <div class="oe_right">
-                            <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
-                        </div>
-                        <div class="oe_clear"/>
-                    </div>
+                        <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
+                    </header>
                 <sheet string="Procurement" layout="auto">
                     <group col="2" colspan="2" class="oe_form_header">
                         <separator colspan="2" string="References"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 21ea84ddb72..31af9a9bc44 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
                     <button name="set_pending" string="Pending" type="object" states="open"/>
@@ -27,11 +27,8 @@
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
+                </header>
                 <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
@@ -304,7 +301,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
@@ -323,11 +320,8 @@
                                 states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <button name="stage_next" string="Next Stage" type="object"
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <div class="oe_right">
-                            <field name="stage_id" nolabel="1" widget="statusbar"/>
-                        </div>
-                        <div class="oe_clear"/>
-                    </div>
+                        <field name="stage_id" widget="statusbar"/>
+                    </header>
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ee937bfdcfc..4914ff26e88 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,10 +8,10 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Configure Project" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Project" colspan="4"/>
                         <field name="module_project_mrp"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 09501686ef9..895b4594185 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -51,7 +51,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
                     <button name="case_close" string="Done" type="object"
@@ -70,11 +70,8 @@
                             attrs="{'invisible': [('stage_id','=', False)]}"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="stage_id" nolabel="1" widget="statusbar"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="stage_id" widget="statusbar"/>
+                </header>
                 <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
                         <field name="name"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eb2c86a0f1b..0c175a4ef7e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -142,17 +142,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </header>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
                         <group colspan="6" col="7" >
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ef230543e9c..fd65ae61b88 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -27,16 +27,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_open" states="draft" string="Open" type="object" />
                     <button name="action_done" states="open" string="Done" type="object" />
                     <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
                     <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
-                    <div class="oe_right">
-                       <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                </header>
                 <sheet string="Planning by Account" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1" />
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7617a71ba4c..4e69dfd3550 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -53,18 +53,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button type="object" string="Open" name="button_open" states="draft,pending"/>
                     <button type="object" string="Close" name="button_close" states="open,pending"/>
                     <button type="object" string="Pending" name="button_pending" states="open"/>
                     <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                </header>
                 <sheet string="Product backlog" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
                         <field name="name" select="1"/>
@@ -228,18 +225,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button type="object" string="Open" name="button_open" states="draft,pending"/>
                     <button type="object" string="Close" name="button_close" states="open,pending"/>
                     <button type="object" string="Pending" name="button_pending" states="open"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
                                    string="Burndown Chart" type="action"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
-                    <div class="oe_right">
-                        <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,open"/>
+                </header>
                 <sheet string="Scrum Sprint" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ce2a9d85b5e..e561473363a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -131,7 +131,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
@@ -144,11 +144,8 @@
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
+                </header>
                 <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
                         <field name="name"/>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 3d4c96b9587..575863fddc4 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Purchases" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 9a9d2bfa105..2b2323308b2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -33,16 +33,13 @@
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
             <form layout="manual">
-            <div class="oe_form_topbar">
+            <header>
                 <button name="tender_in_progress" states="draft" string="Start" type="object" />
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
                 <button name="tender_done" states="in_progress" string="Done" type="object" />
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
-                <div class="oe_right">
-                    <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
-                </div>
-                <div class="oe_clear"/>
-            </div>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
+            </header>
             <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
                     <field name="name"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index abc13dc2c38..9d8b11f2d13 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,7 +97,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
@@ -118,11 +118,8 @@
                         <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                </header>
                 <sheet string="Sales Order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <group col="4" colspan="4">
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 3151c910e2f..49e7686542c 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
+                    <field name="state" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </xpath>
+                    </field>
                 </data>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index e760c453585..7d17d9eec50 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -8,10 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string ="Configure Warehouse" layout="manual">
-                    <div class="oe_form_topbar">
+                    <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
-                    </div>
+                    </header>
                     <sheet layout="auto">
                         <separator string="Traceability" colspan="4"/>
                         <field name="group_stock_production_lot"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 792fcc8e388..e91d247b6d0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -109,16 +109,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <div class="oe_right">
-                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                </header>
                 <sheet string="Physical Inventory" layout="auto">
                 <group class="oe_form_header">
                     <field name="name"/>
@@ -708,7 +705,7 @@
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
                     <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
@@ -717,10 +714,8 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                    </div>
-                </div>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                </header>
                 <sheet string="Internal Picking List" layout="auto">
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
@@ -928,18 +923,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object"/>
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/div[@class='oe_right']/field[@name='state']" position="replace">
+                    <xpath expr="/form/header/div[@class='oe_right']/field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
@@ -1048,13 +1043,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
@@ -1187,16 +1182,13 @@
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                </header>
                 <sheet string="Stock Moves" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
@@ -1373,16 +1365,13 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                </header>
                 <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7a4cef952bf..1b5cd953027 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -13,14 +13,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="button_open" string="Open" states="draft" type="object"/>
                     <button name="button_close" string="Close" states="open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                </header>
                 <sheet string="Stock Periods" layout="auto">
                     <group class="oe_form_header">
                         <field name="name" colspan="2"/>
@@ -85,13 +82,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="action_validate" string="Approve" states="draft" type="object" />
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar"/>
+                </header>
                 <sheet string="Stock and Sales Forecast" layout="auto">
                     <group colspan = "4" col = "4" class="oe_form_header">
                         <group colspan = "2" col="2" >
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 6f21af8c401..b4c992dcbc4 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -14,15 +14,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="set_process" states="draft" string="Process" type="object"/>
                     <button name="set_done" states="running" string="Stop" type="object"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
+                </header>
                 <sheet string="Subscriptions" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e8f02f6d3e0..96dc60ff447 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -19,15 +19,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close"/>
+                </header>
                 <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
@@ -1060,16 +1057,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
+                <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
                     <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
-                    <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
-                    </div>
-                    <div class="oe_clear"/>
-                </div>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
+                </header>
                 <sheet string="Survey Request" layout="auto">
                     <group class="oe_form_header">
                     <field name="date_deadline"/>