diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8254d5183be..6545a59ae65 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -149,10 +149,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </div>
                 <sheet string="Supplier Invoice" layout="auto">
                     <group col="8" colspan="4" class="oe_form_header">
@@ -269,10 +266,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </div>
                 <sheet string="Invoice" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fe1bafecde0..237ab245943 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -15,10 +15,7 @@
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
                 </div>
                 <sheet string="Fiscalyear" layout="auto">
                     <group class="oe_form_header">
@@ -99,10 +96,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1"/>
                 </div>
                 <sheet string="Period" layout="auto">
                 <group class="oe_form_header">
@@ -605,10 +599,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
@@ -670,10 +661,7 @@
                     <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"/>
+                    <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Bank Statement" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
@@ -1364,10 +1352,7 @@
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" />
                 </div>
                 <sheet string="Journal Entries" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
@@ -2636,10 +2621,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Statement" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
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..e99423c3f01 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -111,10 +111,7 @@
                     <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"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Budget" layout="auto">
                 <group class="oe_form_header">
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a85d4156cc4..b6dc9743933 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -106,10 +106,7 @@
                     <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"/>
+                    <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Payment order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a1ff581006b..4747ac65bd8 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -45,10 +45,7 @@
                       <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"/>
+                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </div>
                   <sheet string="Accounting Voucher" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5ceee46b2cd..1571992e4cf 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -149,10 +149,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Bill Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -303,10 +300,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Customer Payment" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b3ba7c99cab..edbdc2f8c41 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -87,10 +87,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Sales Receipt" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -216,10 +213,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Supplier Voucher" layout="auto">
                     <field name="pay_now" invisible="1"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5975210a99c..a5b6cd532e0 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -26,10 +26,7 @@
                         <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"/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
                     <sheet string="Invitation details" layout="auto">
                         <group col="6" colspan="4">
@@ -230,10 +227,7 @@
                         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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                 </div>
                 <sheet string="Events" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 11a9f5d7f6d..cbd0581c240 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -70,11 +70,8 @@
                             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>
                 <sheet layout="auto">
                 <group colspan="4" col="7">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e7176386842..233c5fc9413 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -35,10 +35,7 @@
                             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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </div>
                 <sheet layout="auto">
                 <group col="6" colspan="4">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6360e24a217..07c33e4211b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -72,10 +72,7 @@
                         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"/>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </div>
             <sheet string="Phone Call" layout="auto">
                  <group colspan="6" col="7">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9d0f8d950b0..49b9f06b544 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -104,11 +104,8 @@
                             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>
                 <sheet string="Claims" layout="auto">
                     <group>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b4ed0a38c43..6861034cbd2 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -69,10 +69,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Funds Form" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fe9db30c274..6f683470534 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -42,10 +42,7 @@
                             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"/>
+                    <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Helpdesk Support" layout="auto">
                     <group colspan="4" col="7" class="oe_form_header">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bfa3b496aed..3706a292c6e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -56,10 +56,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </div>
                 <sheet layout="manual">
 
@@ -360,10 +357,7 @@
                     <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"/>
+                    <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </div>
                 <sheet string="Registration" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 32eb3a84c83..5910a1f2244 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -350,10 +350,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                 </div>
                 <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9611ec382e9..6479d66caf7 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -161,10 +161,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </div>
                 <sheet string="Appraisal" layout="auto">
                     <group col="4" colspan="3">
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index edc6f0fd243..cf478a3585f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -70,10 +70,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </div>
                 <sheet string="Expenses Sheet" layout="auto">
                     <group colspan="4" col="6">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bbcec416aff..8842a8c466a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -70,10 +70,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </div>
                 <sheet string="Leave Request" layout="auto">
                     <group col="8" colspan="4">
@@ -122,10 +119,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </div>
                 <sheet string="Allocation Request" layout="auto">
                 <group col="8" colspan="4" class="oe_form_header">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 93e875b61be..9e8fbe5dec5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -267,10 +267,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </div>
                 <sheet string="Payslip" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
@@ -729,10 +726,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar"/>
                 </div>
                 <sheet string="Payslips Batches" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 93a9d01107d..2d466c95e6d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -86,10 +86,7 @@
                         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"/>
+                <field name="stage_id" widget="statusbar"/>
             </div>
             <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="4">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 43ca7a4004e..28d577fe445 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -28,11 +28,8 @@
                         <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>
                 </xpath>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa815df5337..213be0c672f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -66,10 +66,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </div>
                 <sheet string="Timesheet" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index eacb0804658..7240c79f590 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -187,10 +187,7 @@
                 <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"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
             </div>
             <sheet string="New Idea" layout="auto">
             <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index aeb5eed5034..ff2c684bb4c 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -27,10 +27,7 @@
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </div>
                 <sheet string="Order" layout="auto">
                     <field name="user_id" select="1"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index a8edeb81ca4..bec1bede756 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -21,10 +21,7 @@
                 <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"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </div>
             <sheet string="Campaign" layout="auto">
                 <group colspan="4" col="6">
@@ -145,10 +142,7 @@
                 <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"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </div>
             <sheet string="Segments" layout="auto">
                 <group colspan="2" col="2">
@@ -368,10 +362,7 @@
                 <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"/>
+                <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
             </div>
             <sheet string="Marketing Campaign Activities" layout="auto">
                 <group colspan="4" col="6">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f856622c8a1..328df0175fc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -640,10 +640,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </div>
                 <sheet string="Manufacturing Orders" layout="auto">
                     <group colspan="4" col="7">
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 73a74baa471..d3ababd765a 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -75,10 +75,7 @@
                 <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"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
             </div>
             <sheet string="Work Orders" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index ff262329ce2..c338f5b8dfc 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -40,10 +40,7 @@
                    <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"/>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </div>
                <sheet string="Repairs order" layout="auto">
                 <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index a83aab01ca9..f5729a14faf 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -22,10 +22,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                 </div>
                 <sheet string="PoS Orders" layout="auto">
                     <group col="7" colspan="4" class="oe_form_header">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 427b699e0f6..402e3d8479f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -52,10 +52,7 @@
                         <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"/>
+                        <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </div>
                 <sheet string="Procurement" layout="auto">
                     <group col="2" colspan="2" class="oe_form_header">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d5aff449816..e655b3e84f9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,10 +27,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </div>
                 <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
@@ -323,10 +320,7 @@
                                 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"/>
+                        <field name="stage_id" widget="statusbar"/>
                     </div>
                     <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 09501686ef9..8560c87105d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -70,10 +70,7 @@
                             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"/>
+                    <field name="stage_id" widget="statusbar"/>
                 </div>
                 <sheet string="Issue Tracker Form" layout="auto">
                     <group colspan="4" col="6">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index eb2c86a0f1b..936f9995606 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -148,10 +148,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
                 <sheet string="Project Phase" layout="auto">
                     <group colspan="6" col="6">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ef230543e9c..90294c1c30f 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -32,10 +32,7 @@
                     <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"/>
+                   <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Planning by Account" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7617a71ba4c..b1669a99456 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -60,10 +60,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Product backlog" layout="auto">
                     <group colspan="4" col="8" class="oe_form_header">
@@ -235,10 +232,7 @@
                     <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"/>
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Scrum Sprint" layout="auto">
                     <group colspan="4" col="6" class="oe_form_header">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ce2a9d85b5e..9eebadd2a53 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -144,10 +144,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </div>
                 <sheet string="Purchase Order" layout="auto">
                     <group col="6" colspan="4">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 9a9d2bfa105..a0aec3736cf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -38,10 +38,7 @@
                 <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"/>
+                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </div>
             <sheet string="Purchase Requisition" layout="auto">
                 <group colspan="4" col="6">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index abc13dc2c38..68f2a7a0f11 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -118,10 +118,7 @@
                         <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"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </div>
                 <sheet string="Sales Order" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 792fcc8e388..b47a7fa5999 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1378,10 +1378,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </div>
                 <sheet string="Receive Products" layout="auto">
                     <group colspan="4" col="7">
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7a4cef952bf..cb07baaeaa3 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -16,10 +16,7 @@
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </div>
                 <sheet string="Stock Periods" layout="auto">
                     <group class="oe_form_header">
@@ -87,10 +84,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <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"/>
+                    <field name="state" widget="statusbar"/>
                 </div>
                 <sheet string="Stock and Sales Forecast" layout="auto">
                     <group colspan = "4" col = "4" class="oe_form_header">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 6f21af8c401..343a8bc0ba4 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -18,10 +18,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </div>
                 <sheet string="Subscriptions" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e8f02f6d3e0..621172e2860 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -23,10 +23,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </div>
                 <sheet string="Survey" layout="auto">
                     <field name="title" select="1"/>
@@ -1065,10 +1062,7 @@
                     <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"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </div>
                 <sheet string="Survey Request" layout="auto">
                     <group class="oe_form_header">