diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4967d8b12e9..d6d23a0459f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -148,7 +148,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_form_button_active_flow"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' class="oe_form_button_return_flow"/>
                     <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" class="oe_form_button_return_flow"/>
@@ -274,10 +274,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" class="oe_form_button_active_flow" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" class="oe_highlight" 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" class="oe_form_button_active_flow"/>
-                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices" class="oe_form_button_active_flow"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices" class="oe_highlight"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid' class="oe_form_button_return_flow"/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"  class="oe_form_button_return_flow"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f97e9abf1a8..3db660ac9be 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_form_button_active_flow"/>
-                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_form_button_active_flow"/>
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar" nolabel="1" />
                 </header>
                 <sheet string="Fiscalyear" layout="auto">
@@ -589,8 +589,8 @@
             <field name="arch" type="xml">
                 <form string="Bank Statement" version="7.0">
                 <header>
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                    <button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
                     <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
@@ -1270,7 +1270,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar"/>
                 </header>
@@ -1825,8 +1825,8 @@
                 <form string="Recurring" version="7.0">
                     <header>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
-                        <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_form_button_active_flow"/>
-                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove" class="oe_form_button_active_flow"/>
+                        <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_highlight"/>
+                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove" class="oe_highlight"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
                     </header>
                     <sheet>
@@ -2532,8 +2532,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
+                    <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
                     <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index e3bde8d2734..7adda71bc2f 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -81,8 +81,8 @@
         <field name="arch" type="xml">
             <form string="Asset" version="7.0">
                 <header>
-                    <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_form_button_active_flow"/>
-                    <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_form_button_active_flow"/>
+                    <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight"/>
+                    <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight"/>
                     <button name="set_to_draft" states="open" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 0a74a1ae4df..cf5b277eda0 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -110,9 +110,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_form_button_active_flow"/>
-                    <button string="Done" name="done" states="validate" type="workflow" class="oe_form_button_active_flow"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
+                    <button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/>
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 0ced8c85ab9..aa8fd3b8d9c 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -20,7 +20,7 @@
                     <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
                 </field>
                 <button name="proforma_voucher" position="after">
-                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_form_button_active_flow"/>
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
                 </button>
             </field>
         </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index b8cbdad6bc9..f690c86a575 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -104,8 +104,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="open" states="draft" string="Confirm Payments" class="oe_form_button_active_flow"/>
-                    <button name="set_done" states="open" string="Make Payments" type="object" class="oe_form_button_active_flow"/>
+                    <button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
+                    <button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
                     <button name="set_to_draft" states="cancel" string="Set to draft" type="object" class="oe_form_button_return_flow"/>
                     <button name="cancel" states="draft,open" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 0c2749aae01..d50f6fef864 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" class="oe_form_button_active_flow" string="Register Payment" states="open" icon="gtk-go-forward"/>
+               <button name="invoice_pay_customer" type="object" class="oe_highlight" string="Register Payment" states="open" icon="gtk-go-forward"/>
            </button>
            </field>
         </record>
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <button name="invoice_open" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward" class="oe_highlight"/>
                 </button>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e122c99c43c..abca33cc3ea 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -43,7 +43,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                   <header>
-                      <button name="proforma_voucher" string="Post" states="draft" class="oe_form_button_active_flow"/>
+                      <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
                       <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"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0b21ff3937f..7531bd30bb0 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -145,7 +145,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_form_button_active_flow"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <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 ?" class="oe_form_button_return_flow"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" class="oe_form_button_return_flow"/>
@@ -297,7 +297,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_form_button_active_flow"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <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 ?" class="oe_form_button_return_flow"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" class="oe_form_button_return_flow"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 35c024a0256..226fb214dd8 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,8 +82,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_form_button_active_flow"/>
-                    <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)]}" class="oe_form_button_active_flow"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <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)]}" class="oe_highlight"/>
                     <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" class="oe_form_button_return_flow"/>
@@ -219,8 +219,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_form_button_active_flow"/>
-                    <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)]}" class="oe_form_button_active_flow"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <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)]}" class="oe_highlight"/>
                     <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" class="oe_form_button_return_flow"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index e4ca76a29b7..62325e9d52d 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -10,10 +10,10 @@
             <field name="arch" type="xml">
                 <form string="Invitation details" version="7.0">
                     <header>
-                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_form_button_active_flow"/>
-                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_form_button_active_flow"/>
+                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
+                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
                         <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_form_button_active_flow"/>
+                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
@@ -204,8 +204,8 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                 <header>
-                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_form_button_active_flow"/>
-                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_form_button_active_flow"/>
+                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
+                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
                     <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
                     <field name="state" widget="statusbar"
                         statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 662d0a43ea3..d94ce7508df 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -82,7 +82,7 @@
             <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            states="draft,open,pending" help="Convert to Opportunity" class="oe_form_button_active_flow"/>
+                            states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
                     <button name="case_escalate" string="Escalate" type="object"  class="oe_form_button_return_flow"
                             states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
@@ -396,10 +396,10 @@
                     <button name="stage_next" string="Next" type="object"  
                             states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
-                            states="open" class="oe_form_button_active_flow"/>
+                            states="open" class="oe_highlight"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,pending"/>
-                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
+                    <button name="case_open" string="Open" type="object" class="oe_highlight"
                             states="draft,pending"/>
                     <button name="case_escalate" string="Escalate" type="object"
                             states="open" class="oe_form_button_return_flow"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index b11ca42efd6..6e32c14c5b4 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -27,9 +27,9 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <button name="case_open" string="Confirm" type="object" class="oe_form_button_active_flow"
+                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
                             states="draft"/>
-                    <button name="case_close" string="Done" type="object" class="oe_form_button_active_flow"
+                    <button name="case_close" string="Done" type="object" class="oe_highlight"
                             states="open"/>
                     <button name="case_reset" string="Reset to Unconfirmed" type="object" class="oe_form_button_return_flow"
                             states="cancel,done"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index fb137e62e8d..67565266b34 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -64,15 +64,15 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="case_open" string="Confirm" type="object" class="oe_form_button_active_flow"
+                <button name="case_open" string="Confirm" type="object" class="oe_highlight"
                         states="draft,pending"/>
-                <button name="case_close" string="Held" type="object" class="oe_form_button_active_flow"
+                <button name="case_close" string="Held" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
-                <button string="Convert to Opportunity"  class="oe_form_button_active_flow"
+                <button string="Convert to Opportunity"  class="oe_highlight"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9bf9131402b..6ed967fd39a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -90,11 +90,11 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
+                    <button name="case_open" string="Open" type="object" class="oe_highlight"
                             states="draft,pending" />
-                    <button name="case_close" string="Done" type="object" class="oe_form_button_active_flow"
+                    <button name="case_close" string="Done" type="object" class="oe_highlight"
                             states="open,pending"/>
-                    <button name="case_refuse" string="Refuse" type="object" class="oe_form_button_active_flow"
+                    <button name="case_refuse" string="Refuse" type="object" class="oe_highlight"
                             states="draft,open,pending"/>
                     <button name="stage_previous" string="Previous Stage" type="object"
                             states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index a1cb6a82e5d..f556e01bdd6 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -63,9 +63,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_close" string="Done" states="open,pending" type="object" class="oe_form_button_active_flow"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_form_button_active_flow"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_form_button_active_flow"/>
+                    <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" class="oe_form_button_return_flow"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" class="oe_form_button_return_flow"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 8f640b3d241..c8e176edd94 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,10 +30,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
+                    <button name="case_open" string="Open" type="object" class="oe_highlight"
                             states="draft,pending"/>
                     <button name="case_close" string="Close" type="object" states="draft,pending"/>
-                    <button name="case_close" string="Close" type="object" states="open" class="oe_form_button_active_flow"/>
+                    <button name="case_close" string="Close" type="object" states="open" class="oe_highlight"/>
                     <button name="case_pending" string="Pending" type="object"
                             states="draft"/>
                     <button name="case_pending" string="Pending" type="object" class="oe_form_button_return_flow"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f567860781f..6ea85199079 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -54,8 +54,8 @@
             <field name="arch" type="xml">
             <form string="Events" version="7.0">
                 <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_form_button_active_flow"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_form_button_active_flow"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
                     <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
@@ -355,8 +355,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_form_button_active_flow"/>
+                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f20e88c75cd..a4aec7ee7ff 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -354,8 +354,8 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_form_button_active_flow"/>
-                        <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_form_button_active_flow"/>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2dc0ece4300..4901eb3e76f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -148,9 +148,9 @@
             <field name="arch" type="xml">
                 <form string="Appraisal" version="7.0">
                 <header>
-                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_done" string="Done" states="progress" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" class="oe_highlight"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_highlight"/>
+                    <button name="button_done" string="Done" states="progress" type="object" class="oe_highlight"/>
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object" class="oe_form_button_return_flow"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
@@ -275,13 +275,13 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
-                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_form_button_active_flow"/>
-                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" class="oe_form_button_active_flow"/>
+                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_highlight"/>
+                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" class="oe_highlight"/>
                         <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
-                        <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_form_button_active_flow"/>
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_highlight"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7c81ae614c7..4f230d39deb 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -65,10 +65,10 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet" version="7.0">
                 <header>
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_form_button_active_flow"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
-                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2d6730ec50a..227d77d6366 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,10 +65,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
-                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_form_button_active_flow"/>
+                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
@@ -114,10 +114,10 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
-                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0c9f84afebd..3705af57b64 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -258,10 +258,10 @@
             <field name="arch" type="xml">
                 <form string="Payslip" version="7.0">
                 <header>
-                    <button string="Confirm" name="hr_verify_sheet" states="draft" class="oe_form_button_active_flow"/>
+                    <button string="Confirm" name="hr_verify_sheet" states="draft" class="oe_highlight"/>
                     <button string="Refund" name="refund_sheet" states="confirm,done" type='object' class="oe_form_button_return_flow"/>
                     <button string="Set to Draft" name="draft" states="cancel"/>
-                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_form_button_active_flow"/>
+                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_highlight"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
@@ -723,8 +723,8 @@
             <field name="arch" type="xml">
                 <form string="Payslips Batches" version="7.0">
                 <header>
-                    <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_form_button_active_flow"/>
-                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_form_button_active_flow"/>
+                    <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
                     <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar"/>
                 </header>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 82d684e7629..53031fc3f7e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -82,15 +82,15 @@
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
-                        states="open,pending" class="oe_form_button_active_flow"/>
+                        states="open,pending" class="oe_highlight"/>
                 <button name="case_open" string="Open" type="object"
-                        states="draft,pending" class="oe_form_button_active_flow"/>
+                        states="draft,pending" class="oe_highlight"/>
                 <button name="case_pending" string="Pending" type="object"
                         states="open" class="oe_form_button_return_flow"/>
                 <button name="case_reset" string="Reset to New" type="object"
                         states="done,cancel" class="oe_form_button_return_flow"/>
                 <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending" class="oe_form_button_active_flow"/>
+                        states="draft,open,pending" class="oe_highlight"/>
                 <button name="stage_previous" string="Previous" type="object"
                         states="open" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" type="object"
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index e97fcd0272a..ee1928fbbb0 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -25,7 +25,7 @@
                 <xpath expr="/form/sheet" position='before'>
                     <header>
                         <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending" class="oe_form_button_active_flow"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending" class="oe_highlight"/>
                         <button name="set_open" string="Re-open project" type="object" states="pending,close" class="oe_form_button_return_flow"/>
                         <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1bfee9f0442..3b42ababc57 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -64,8 +64,8 @@
             <field name="arch" type="xml">
                 <form string="Timesheet" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_form_button_active_flow"/>
-                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 5ff0fa6d032..99c055d1fbb 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -67,9 +67,9 @@
         <field name="arch" type="xml">
             <form string="Idea" version="7.0">
                 <header>
-                    <button name="idea_open" string="Open" states="draft" class="oe_form_button_active_flow"/>
-                    <button name="idea_close" string="Accept" states="open" class="oe_form_button_active_flow"/>
-                    <button name="idea_cancel" string="Refuse" states="open"  class="oe_form_button_active_flow"/>
+                    <button name="idea_open" string="Open" states="draft" class="oe_highlight"/>
+                    <button name="idea_close" string="Accept" states="open" class="oe_highlight"/>
+                    <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
                     <label for="name" class="oe_form_readonly_hidden"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index de6d49d6d97..457e22107b9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -25,7 +25,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_form_button_active_flow"/>
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 53bc2fc0df5..27d44953217 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -17,8 +17,8 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="state_running_set" string="Run" states="draft" class="oe_form_button_active_flow"/>
-                <button name="state_done_set" string="Done" states="running" class="oe_form_button_active_flow"/>
+                <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
+                <button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled" class="oe_form_button_return_flow"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
@@ -135,8 +135,8 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="state_running_set" string="Run" states="draft" class="oe_form_button_active_flow"/>
-                <button name="state_done_set" string="Close" states="running" class="oe_form_button_active_flow"/>
+                <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
+                <button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled" class="oe_form_button_return_flow"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dd588377f5a..f9dd36411c0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -603,10 +603,10 @@
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Confirm Production" class="oe_form_button_active_flow"/>
-                    <button name="button_produce" states="ready" string="Start Production" class="oe_form_button_active_flow"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_form_button_active_flow" />
-                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_form_button_active_flow"/>
+                    <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
+                    <button name="button_produce" states="ready" string="Start Production" class="oe_highlight"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_highlight" />
+                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
                     <button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index fcc935b2d01..4599f010b82 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+`<?xml version="1.0"?>
 <openerp>
 <data>
 
@@ -69,9 +69,9 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="button_start_working" string="Start" states="draft" class="oe_form_button_active_flow"/>
-                <button name="button_resume" string="Resume" states="pause" class="oe_form_button_active_flow"/>
-                <button name="button_done" string="Finished" states="startworking" class="oe_form_button_active_flow"/>
+                <button name="button_start_working" string="Start" states="draft" class="oe_highlight"/>
+                <button name="button_resume" string="Resume" states="pause" class="oe_highlight"/>
+                <button name="button_done" string="Finished" states="startworking" class="oe_highlight"/>
                 <button name="button_pause" string="Pending" states="startworking" class="oe_form_button_return_flow"/>
                 <button name="button_draft" string="Set Draft" states="cancel" class="oe_form_button_return_flow"/>
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 24dc2d98b98..26ce8f1d8d6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -29,11 +29,11 @@
         <field name="arch" type="xml">
             <form version="7.0">
                <header>
-                   <button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_form_button_active_flow"/>
-                   <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_form_button_active_flow"/>
+                   <button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_highlight"/>
+                   <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
-                   <button name="action_repair_end" states="under_repair" string="End Repair" class="oe_form_button_active_flow"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_form_button_active_flow"/>
+                   <button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                    <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                    <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 64d66add0a3..e9ffb3b6218 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -18,10 +18,10 @@
             <field name="arch" type="xml">
                 <form string="PoS Orders" version="7.0">
                 <header>
-                    <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft" class="oe_form_button_active_flow"/>
+                    <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft" class="oe_highlight"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
-                    <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}" class="oe_form_button_active_flow"/>
-                    <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid" class="oe_form_button_active_flow"/>
+                    <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}" class="oe_highlight"/>
+                    <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid" class="oe_highlight"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 4663cf20438..2cc15194707 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,9 +48,9 @@
             <field name="arch" type="xml">
                 <form string="Procurement" version="7.0">
                     <header>
-                        <button name="button_confirm" states="draft" string="Confirm" class="oe_form_button_active_flow"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement" class="oe_form_button_active_flow"/>
-                        <button name="button_restart" states="exception" string="Retry" class="oe_form_button_active_flow"/>
+                        <button name="button_confirm" states="draft" string="Confirm" class="oe_highlight"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" class="oe_highlight"/>
+                        <button name="button_restart" states="exception" string="Retry" class="oe_highlight"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7458276fd8c..f68a901d4dd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
                     <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -328,16 +328,16 @@
                     <header>
                         <!--
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_form_button_active_flow"/>
+                                states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
                                 states="cancel,done" class="oe_form_button_return_flow"/>
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                                states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_highlight"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e05726d43bb..c80970c9ebc 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -55,9 +55,9 @@
                 <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
-                            states="draft,pending" class="oe_form_button_active_flow"/>
+                            states="draft,pending" class="oe_highlight"/>
                     <button name="case_close" string="Done" type="object"
-                            states="open" class="oe_form_button_active_flow"/>
+                            states="open" class="oe_highlight"/>
                      <button name="case_close" string="Done" type="object"
                             states="draft,pending"/>
                     <button name="case_pending" string="Pending" type="object"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0d1b8ebd8c4..7ddc7fec1ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,8 +143,8 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
-                    <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
+                    <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
                     <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
                     <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f56bd3e0c51..8499dfd9c39 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -128,16 +128,16 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_active_flow"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
                     <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" class="oe_form_button_active_flow"/>
+                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_active_flow"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_active_flow"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_form_button_active_flow"/>
-                    <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_form_button_active_flow"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c0a36c59a61..991a0989062 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -34,9 +34,9 @@
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
             <header>
-                <button name="tender_in_progress" states="draft" string="Start" type="object" class="oe_form_button_active_flow"/>
+                <button name="tender_in_progress" states="draft" string="Start" type="object" class="oe_highlight"/>
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" class="oe_form_button_return_flow"/>
-                <button name="tender_done" states="in_progress" string="Done" type="object" class="oe_form_button_active_flow"/>
+                <button name="tender_done" states="in_progress" string="Done" type="object" class="oe_highlight"/>
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d84e196ae4f..d0c1b27aa2f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -107,14 +107,14 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_form_button_active_flow"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_form_button_active_flow"/>
-                        <button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_form_button_active_flow"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_highlight"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
+                        <button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_highlight"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_active_flow" type="object"/>
-                        <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_form_button_active_flow"
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
+                        <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                           attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
-                        <button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_form_button_active_flow"
+                        <button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_highlight"
                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>
                         <button name="cancel" states="draft,sent" string="Cancel"/>
@@ -413,8 +413,8 @@
                 <form string="Sales Order Lines" version="7.0">
                     <header>
                         <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
-                        <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_form_button_active_flow"/>
-                        <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_highlight"/>
+                        <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_highlight"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
                     <sheet>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0890680e085..e49ee2e8e00 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -112,8 +112,8 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_form_button_active_flow"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_form_button_active_flow"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
@@ -716,12 +716,12 @@
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
                 <header>
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_form_button_active_flow"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_form_button_active_flow"/>
+                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
                     <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
-                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_form_button_active_flow"/>
-                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_form_button_active_flow"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_form_button_active_flow"/>
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
+                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" class="oe_form_button_return_flow"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
@@ -956,15 +956,15 @@
             <field name="arch" type="xml">
                 <data>
                     <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" class="oe_form_button_active_flow"/>
+                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/>
                     </xpath>
                     <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_form_button_active_flow"/>
-                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_form_button_active_flow"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
+                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header/button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header/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"}'/>
@@ -1079,10 +1079,10 @@
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/>
                     </xpath>
                     <xpath expr="//button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_form_button_active_flow"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Receive" type="object" class="oe_form_button_active_flow"/>
+                        <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
@@ -1215,9 +1215,9 @@
             <field name="arch" type="xml">
                 <form string="Stock Moves" version="7.0">
                 <header>
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_form_button_active_flow"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_form_button_active_flow"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_form_button_active_flow"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
@@ -1405,9 +1405,9 @@
             <field name="arch" type="xml">
                 <form string="Receive Products" version="7.0">
                 <header>
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_form_button_active_flow"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_form_button_active_flow"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_form_button_active_flow"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index eee36b6d016..91bca661911 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -83,7 +83,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="action_validate" string="Approve" states="draft" type="object" class="oe_form_button_active_flow"/>
+                    <button name="action_validate" string="Approve" states="draft" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Stock and Sales Forecast" layout="auto">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 839dffd1b63..8bb7d0518bf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,8 +15,8 @@
             <field name="arch" type="xml">
                 <form string="Subscriptions" version="7.0">
                 <header>
-                    <button name="set_process" states="draft" string="Process" type="object" class="oe_form_button_active_flow"/>
-                    <button name="set_done" states="running" string="Stop" type="object" class="oe_form_button_active_flow"/>
+                    <button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/>
+                    <button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 89624e52b0f..f7ea2e3fe9e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -21,7 +21,7 @@
                 <form string="Survey" version="7.0">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object" class="oe_form_button_return_flow"/>
-                    <button name="survey_close" string="Close" states="open" type="object" class="oe_form_button_active_flow"/>
+                    <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
@@ -1061,8 +1061,8 @@
                 <form version="7.0">
                 <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_form_button_active_flow"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_form_button_active_flow"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_highlight"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_highlight"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>