diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 2a97c027eb4..961b56c2d19 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="has_default_company" invisible="1" />
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 3ecd73c1180..fdf27e8cefd 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,7 +107,7 @@ class account_move_journal(osv.osv_memory):
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
                 <header>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_form_button_active_flow"/>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
                 </header>
                 <group string="%s" colspan="4">
                     <field name="target_move" />
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 0a8c40ce76d..9fc5d3f62b5 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -86,7 +86,7 @@
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <header>
-                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Module Information" colspan="4"/>
                     <field name="name"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 7540d2dd448..971a417d16d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -23,7 +23,7 @@
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <header>
-                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 45f39c88149..9c27fe49232 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -71,7 +71,7 @@ class repair_cancel(osv.osv_memory):
         if not repair_order.invoiced:
             res['arch'] = """ <form string="Cancel Repair" colspan="4">
                               <header>
-                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_highlight"/>
                               </header>
                             <group col="2" colspan="2">
                                 <label string="Do you want to continue?" colspan="4"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 579b7a84cbc..fe2157370a1 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Payment Report" version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print"class="oe_highlight"/>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                 </form>
             </field>