diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7d9ba11906e..de0fbdbd484 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1984,7 +1984,7 @@
             <field name="arch" type="xml">
                 <form string="Create Account" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"/>
                     </header>
                     <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
                     <field name="cparent_id"/>
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index a7018ddc9c1..f12999e3031 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index af33b3b102e..8f497003c57 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account Charts" version="7.0">
                     <header>
-                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group string="Select the Period for Analysis" col="4">
                         <field name="from_date"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 3713fa8d4c0..1637398af90 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group string="Cost Ledger for Period" col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index d8346ffec21..cd730ce628c 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 9c196f8bd83..73c66103b74 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index ecf61ee6903..e623e79d2d1 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 9d36b439d50..f6b4c3aabdb 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="View Account Analytic Lines" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index aa71d2125d0..008c454bb92 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_form_button_active_flow"/>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight"/>
                     </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 724f275c92c..752c5bed915 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <header>
-                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_form_button_active_flow"/>
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight"/>
                     </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index cbbcb13b27c..a09c49257f8 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 45a34044dcb..0e6243327ac 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
 	                <header>
-	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_form_button_active_flow"/>
+	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight"/>
 	                </header>
 	                <separator string="Close states of Fiscal year and periods"/>
 	                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 97d39d34650..6538ed3ff0d 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 4aa4aa51c45..c393c2f0202 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
                     <header>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_form_button_active_flow"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 82141bd2161..0030beb1ca7 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
 	            <form string="Confirm Draft Invoices" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
 	                </header>
 	                <separator string="Confirm Draft Invoices" colspan="4"/>
 	            </form>
@@ -28,7 +28,7 @@
             <field name="arch" type="xml">
 	            <form string="Cancel Selected Invoices" version="7.0">
 	                <header>
-	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
 	                </header>
 	                <separator string="Cancel Selected Invoices" colspan="4"/>
 	            </form>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 7e3c06f067c..600bff30698 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
 	            <form string="Journal Select" version="7.0">
 	                <header>
-	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
 	                </header>
 	                <label string="Are you sure you want to open Journal Entries?"/>
 	            </form>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 7f00d66efae..62e12534fe5 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index f12ce2da4bb..aa6da30ea75 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                          <field name="account_id"/>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 7b5897685d0..26ab9dcaadd 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <label string="Are you sure you want to open Account move line entries!"/>
                </form>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 9f5132da6e7..1d1c0c6738c 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="account_id"/>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index d6599d257ca..c1308a2c971 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index f088fb648d3..dc5a01f7700 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
                     <header>
-                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Are you sure?" colspan="4"/>
                     <group>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 8f8c11ed65e..7fd3def218f 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
                     <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_form_button_active_flow"/>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="next_partner_id"/>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 84bed269d84..dc13ae1caaf 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_form_button_active_flow"/>
-                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_form_button_active_flow"/>
-                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_form_button_active_flow"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
                     </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
@@ -50,7 +50,7 @@
             <field name="arch" type="xml">
                 <form string="Information addendum" version="7.0">
                     <header>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <group string="Write-Off Move" col="4">
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index dc6542b8feb..02064472160 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight"/>
                     </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 01561f61f55..c8bf4c935a1 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
                 <header>
-                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_form_button_active_flow"/>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight"/>
                 </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 9034b5372f4..61fe2a342a4 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
                     <header>
-                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight"/>
                     </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 42661c00362..4940dd7b448 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index eb27df6d22c..2bae500bb56 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="period_id"/>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 3f15b67f59a..42c8210bfb6 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                 </header>
                 <separator string="Unreconciliate Transactions"/>
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
@@ -42,7 +42,7 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
                 </header>
                 <separator string="Unreconciliation Transactions"/>
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index a6ef4b9ede2..a1d5cf12dd7 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
 	                <header>
-	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_form_button_active_flow"/>
+	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
 	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                     </header>
                     <label string = "Are you sure you want to create entries?"/>
                </form>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 6f10f9ad693..49b5fe865bf 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
 	            <form string="Post Journal Entries" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_form_button_active_flow"/>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_highlight"/>
 	                </header>
 	                <separator string="Post Journal Entries of a Journal"/>
 	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
@@ -47,7 +47,7 @@
             <field name="arch" type="xml">
 	            <form string="Post Journal Entries" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
 	                </header>
 	                <separator string="Post Journal Entries"/>
 	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index a2108e43968..ba13b17bb46 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
                 <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 2fd918c20ac..8b4d290c76b 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="date1"/>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index 0c4f446e322..0539db16bdd 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
                 <header>
-                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_form_button_active_flow"/>
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight"/>
                 </header>
                 <label string="Save This Distribution as a Model"/>
             </form>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 0016f2bc33b..e23c9d85079 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
                     <header>
-                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_highlight"/>
                     </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 8055ab68a42..b3114dde5fa 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index 3f3e96f1c34..5d73127e45a 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -11,7 +11,7 @@
       <field name="arch" type="xml">
         <form string="Confirm selected statement lines" version="7.0">
             <header>
-                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_form_button_active_flow"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight"/>
             </header>
             <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
             <label string="Confirmed lines cannot be changed anymore."/>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 9820d5c0b6c..4653ba8e686 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 62700068362..65e7d82d86e 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ceb66a50488..f442a34be9a 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index c5dd0dab7cf..da32ef5dae3 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -9,7 +9,7 @@
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
               <header>
-                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_form_button_active_flow"/>
+                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
               </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index d41230642ac..84714ab5c71 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -10,7 +10,7 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
             <header>
-                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_highlight"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>
@@ -28,8 +28,8 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
           <header>
-              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight"/>
           </header>
           <group string="Results :">
               <field name="note" nolabel="1" colspan="2"/>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index b79cd10d05c..7d407b5d8b5 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <separator string="Send Follow-Ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
@@ -75,8 +75,8 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index 941580e2862..2c000bcdca0 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Message" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="message"/>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index e451787c3f6..9d5a1f503d5 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
                 <header>
-                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
                 </header>
                 <group>
                     <field name="duedate" />
@@ -25,7 +25,7 @@
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
                     <header>
-                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
                     </header>
                     <separator string="Entries"/>
                     <field name="entries"/>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 7fcc4f9eabc..f1a47e653ca 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
                     <header>
-                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight"/>
                     </header>
                     <separator string="Are you sure you want to make payment?"/>
                 </form>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index 4b2bd93a2e9..2763921c5cd 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -9,7 +9,7 @@
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
                     <header>
-                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <field name="lines"/>
                 </form>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 68053de9f34..2674e8f336d 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                         <field name="date"/>
@@ -35,7 +35,7 @@
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index be2d68736f5..e1fd6cfb07a 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <separator string="Unreconciliation Transactions" />
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index 757a6618db6..f9414228202 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
                     <header>
-                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight" />
                     </header>
                     <group col="4">
                          <field name="from"/>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 2607cf9a065..dd61e54d09a 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
                     <header>
-                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index a4bf4910bc9..02937df25bc 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
                     <header>
-                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Relationship Graphs" colspan="6"/>
                 </form>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index c487845b42b..100de20ca28 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="check_date"/>
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 a643740521e..0a8c40ce76d 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
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
                     </header>
                     <group> 
                         <field name="check_date"/>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index df40d2972a0..6c4e7deb9f0 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <header>
-                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_form_button_active_flow"/>
+                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <separator string="Recording Information" colspan="4"/>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 1381e2823ec..c7f705b277d 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -11,7 +11,7 @@
                     <form position="attributes" version="7.0">
                         <header>
                             <xpath expr="//button[@string='Install Modules']" position="replace">
-                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_form_button_active_flow"/>
+                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_highlight"/>
                             </xpath>
                         </header>
                         <attribute name="string">OpenERP Report Designer Configuration</attribute>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index c98da3fca50..14f18949ffb 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
                 <header>
-                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
-                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                 </header>
                 <separator string="Select your report" colspan="4"/>
                 <field name="report_id"/>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4e0c569bca7..ea385fafa9c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -39,7 +39,7 @@
         <field name="arch" type="xml">
             <form string="Configure Sales" 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>
                     <group name="config_sale" colspan="4"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index d0b9bef7dd8..1c81907fd0f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" 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>
                         <group string="Company Settings">
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 0a2decbd24f..38848e0f141 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
                     <header>
-                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 6be0e7ad4a6..4393e2d8657 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -25,7 +25,7 @@
             <field name="arch" type="xml">
                <form string="Caldav's host name configuration" version="7.0">
                     <header>
-                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                 	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
                     <newline/>
@@ -44,7 +44,7 @@
             <field name="arch" type="xml">
                 <form string="User Preference" version="7.0">
                     <header>
-                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="" colspan="4"/>
                     <field name="service"  colspan="4" width="250" readonly="1"/>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 87a16ae7af0..ccda19944a9 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
                     <header>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class=
-"oe_form_button_active_flow"/>
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index f2f288ac3ad..0d427824e26 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
                     <header>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 4b7f2635781..8b8636a5f90 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
                     <header>
-                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Add Note"/>
                     <field name="body"/>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 90db335cd3b..c92f92d686f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,7 +7,7 @@
           <field name="arch" type="xml">
                <form string="Convert to Opportunity" version="7.0">
                     <header>
-                        <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
@@ -37,7 +37,7 @@
 	          <field name="arch" type="xml">
 	               <form string="Convert to Opportunity" version="7.0">
 	                    <header>
-	                        <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+	                        <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_highlight"/>
 	                    </header>
                         <field name="action"/>
                         <field name="name" colspan="4"/>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index d7a49f85609..3b4872e9b04 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -10,7 +10,7 @@
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
                   <header>
-                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
                   <separator string="Create a Partner"/>
                   <group col="4">
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index c78e8f8b49a..5b68a20ab33 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
                     <header>
-                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6b134b99ab4..a5dd9c69d13 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -11,8 +11,8 @@
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
                     <header>
-                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_form_button_active_flow"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_form_button_active_flow"/>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index a5f457e58d0..2cc8825078f 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -10,7 +10,7 @@
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
                   <header>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
                   <group col="4">
                       <field name="name"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 9855f236ca5..a115a2d8f5e 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -13,7 +13,7 @@
                 <form string="Convert To Meeting" version="7.0">
                     <header>
                         <button name="action_make_meeting" type="object"
-                            string="_Schedule" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                            string="_Schedule" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
                 </form>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index e32e1437d56..0bedfc34dc8 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
                     <header>
-                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_form_button_active_flow"/>
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="name"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 87eed040be6..f9a401dd019 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -10,7 +10,7 @@
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
                 <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager" class="oe_highlight"/>
                 </header>
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
                 <label string="You may have to verify that this partner does not exist already."/>
@@ -27,7 +27,7 @@
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
                 <header>
-                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <group>
                     <field name="action"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 4d7e5c4c0e7..0dce7a02003 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -11,8 +11,8 @@
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
                     <header>
-                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_form_button_active_flow"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_form_button_active_flow"/>
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Schedule/Log a Call" colspan="4"/>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index b1dd89ca215..de078c48825 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
                     <header>
-                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 8b3cfef878e..f9193e18c9d 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
                     <header>
-                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_form_button_active_flow"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="questionnaire_id"/>
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_form_button_active_flow"/>
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_highlight"/>
                     </header>
                     <separator colspan="4" string="Questionnaire"/>
                     <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index af8e9cd48b5..2bbdb02291b 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Browse Document"/>
                     <group>
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index b25e04eae1a..17ca7f4fc07 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
                   <header>
-                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_form_button_active_flow"/>
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                   </header>
                   <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
             </form>
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 18929f1fb5c..3a4e46809b4 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Moodle" version="7.0">
                     <header>
                         <button type="object" name="configure_moodle"
-                            string="Configure Moodle" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            string="Configure Moodle" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                      <separator string="Server" colspan="4"/>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index 3c4c279e72e..3c8fce29870 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
                    <header>
-                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_form_button_active_flow"/>
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
                    </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index 555216ad50c..67d071d23b6 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
                     <header>
-                        <button name="login" string="_Login" type="object" icon="terp-check" class="oe_form_button_active_flow"/>
+                        <button name="login" string="_Login" type="object" icon="terp-check" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index eb93e563361..9c9fd628a6b 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -16,7 +16,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" 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">
                         <separator string="Additional Features" colspan="4"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 31d33bdacb7..73b96b0654a 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="month"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 59c32fd1fd5..dc86e984a73 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <field name="init_date"/>
                 <field name="end_date"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 376892eeec8..6aa0144a351 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index ecb6b43073f..59130f531ec 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
                     <header>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_form_button_active_flow"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_highlight"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight"/>
                     </header>
                     <separator colspan="4" string="Sign in / Sign out"/>
                     <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.out.ask" version="7.0">
                     <header>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                     <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
@@ -71,7 +71,7 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.in.out.ask" version="7.0">
                     <header>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                     <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 7458afa1f5f..137138f6b54 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -9,7 +9,7 @@
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
                 <header>
-                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <group string="Send Evaluation Reminder">
                     <field name="evaluation_id"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ac47342fc6e..f5505267340 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
                 <header>
-                    <button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_form_button_active_flow"/>
+                    <button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_highlight"/>
                 </header>
                 <group>
                     <field name="date_from" />
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 5f4fae16cda..c773150a995 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
                     <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index 0005fdf70da..ee76c425ab9 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Contribution Register's Payslip Lines" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <group col="4" colspan="6">
                     <field name="date_from"/>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 52084828e61..020af36cd26 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Payslips by Employees" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_highlight"/>
                     </header>
                     <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
                     <group colspan="4" >
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 7d975746391..597758db1b0 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
 			<form string="Convert To Partner" version="7.0">
 			    <header>
-			        <button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager" class="oe_form_button_active_flow"/>
+			        <button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager" class="oe_highlight"/>
 			    </header>
 			    <group col="4" colspan="6">
 			        <label string="Are you sure you want to create a contact based on this job request ?"/>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index c256dbaa775..936d506a2eb 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Create New Employee" version="7.0">
                 <header>
-                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_highlight"/>
                     <button name="case_close" string="No" icon='gtk-no' type="object"/>
                 </header>
                 <label string="Would you like to create an employee ?" colspan="4" />
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index 90217d8ba8f..c40169e77ed 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
 			<form string="Schedule Phone Call" version="7.0">
 			    <header>
-			        <button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+			        <button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
 			    </header>
 			    <group col="4" colspan="6">
                     <separator string="Phone Call Description" colspan="4" />
@@ -35,4 +35,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index c35fcf16483..197060d092a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
 				<form string="Monthly Employee Timesheet" version="7.0">
 				    <header>
-				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
 				    </header>
 					<group colspan="4">
 						<field name="month"/>
@@ -44,7 +44,7 @@
             <field name="arch" type="xml">
                 <form string="Print My Timesheet" version="7.0">
                     <header>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4">
                     <separator string="This wizard will print monthly timesheet" colspan="4"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 555351c3ff3..6d6f8f93e7f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
 				<form string="Monthly Employees Timesheet" version="7.0">
 				    <header>
-				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
 				    </header>
 					<group height="260" width="460">
 						<group colspan="4">
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 97e269984be..7540d2dd448 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
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <header>
-                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
                     </header>
                     <separator colspan="4" string="Sign In/Out by Project"/>
                     <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
@@ -55,8 +55,8 @@
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <header>
-                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_form_button_active_flow"/>
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index bfa0f2d11e6..a286938330d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet Profit" version="7.0">
                     <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group height="420" width="370">
                         <group col="4" colspan="4">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 0457fd97e72..db33fc98aa7 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -28,7 +28,7 @@
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
                 <header>
-                    <button name="do_create" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                    <button name="do_create" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index df840f9280d..0d72d09569e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
                 <header>
-                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
                 <group>
 	                <group string="Do you want to show details of work in invoice?" colspan="4">
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 0633c953cd4..bbff34aac29 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -8,7 +8,7 @@
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
                <header>
-                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_form_button_active_flow"/>
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
                </header>
                <separator string="It will open your current timesheet"/>
            </form>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 35ccedb0931..8a9eed7fcb1 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_form_button_active_flow"/>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight"/>
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_form_button_active_flow"/>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight"/>
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7365b19cd5f..82581da047b 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -10,8 +10,8 @@
       <field name="arch" type="xml">
         <form string="Import Data From SugarCRM" version="7.0">
           <header>
-	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
-	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_highlight"/>
+	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight"/>
           </header>
           <group col="8" >
             <group colspan="2" col="2" width="200">
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index bc139bc8789..3deda45ff0d 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" 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>
                     <newline/>
                     <separator string="Wiki" colspan="4"/>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 5322aa9eb7b..f44218561ed 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
                     <header>
-                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <group>
                         <group string="Declare Periodical VAT">
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 99b1badd1ac..7375cf729aa 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <form string="Partner VAT Listing" version="7.0">
           <header>
-            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_form_button_active_flow"/>
+            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight"/>
           </header>
           <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
           <newline/>
@@ -64,7 +64,7 @@
       <field name="arch" type="xml">
         <form string="XML File has been Created." version="7.0">
             <header>
-                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
             </header>
             <separator string="XML File has been Created." colspan="4"/>
             <label string="Save the File with '.xml' extension." colspan="4" nolabel="1"/>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 33e2590eac7..591e41707d7 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
                     <header>
-                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_form_button_active_flow"/>
+                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight"/>
                     </header>
                     <separator string="Intracom VAT Declaration"/>
                     <notebook colspan="4">
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 9dff2ca79db..85c8f6caa57 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
                     <header>
-                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_form_button_active_flow"/>
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="file"/>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index dd1f816f947..28679e69ee8 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
                     <header>
-                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_form_button_active_flow"/>
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="dta_file"/>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 493f51b700f..d60a6e64ce0 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
                    <header>
-                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                    </header>
                    <field name="fiscalyear_id"/>
                  </form>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 84610b5df42..952d4a57571 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
                     <header>
-                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <field name="fiscalyear_id"/>
                  </form>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 33526abf6bc..56d2865a81c 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
                    <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_highlight"/>
                    </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 5d23d6353f9..fb2c5c309c6 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"/>
                     </header>
                     <label string="Are you sure you want to reset this cashbox ?"/>
                </form>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 155ff05b1f9..aa653c60cde 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index b5b027bf3c6..a92e7a9a916 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index da782ae16ab..47f5f6509b1 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight"/>
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 3f57aa27789..435708224d0 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Marketing" 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" string="Campaigns">
                         <field name="module_marketing_campaign"/>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index c52aa9853df..461e712260a 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
                     <header>
-                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_form_button_active_flow"/>
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index ad2a99b2892..bdf0e977005 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" 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>
                     <newline/>
                     <group col="4" string="Manufacturing Order">
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 94e489ad25b..fe6b5bcb2f4 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -12,7 +12,7 @@
                 <form string="Change Product Qty" version="7.0">
                     <header>
                         <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Change Quantity" colspan="4"/>
                     <newline/>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index a5dc2a64239..6399681dd5e 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -12,7 +12,7 @@
                 <form string="Product Cost Structure" version="7.0">
                     <header>
                             <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight" />
                     </header>
                     <separator colspan="4" string="Print Cost Structure of Product." />
                     <field name="number"/>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 825508000df..2b92cf4d51c 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -13,7 +13,7 @@
                 <form string="Produce" version="7.0">
                     <header>
                         <button name="do_produce" string="Confirm"
-                            colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Produce" colspan="4"/>
                     <field name="mode" colspan="4"/>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index 28b6a9c0e17..c12e4834fc0 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -12,7 +12,7 @@
                 <form string="Select time unit" version="7.0">
                     <header>
                         <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <sheet layout="auto">
                         <field name="time_unit"/>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index 278b98b2aba..f1c5aae61f2 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
                     <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>
                     <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                 </form>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 4de44cd86a9..a65c3c3f02b 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
                 <header>
-                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl"  class=
-"oe_form_button_active_flow"/>
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 751aa4a3e67..b3b333b95ba 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Put Money" version="7.0">
                     <header>
-                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_form_button_active_flow" />
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight" />
                     </header>
                     <separator string="Fill in this form if you put money in the cash register:"/>
                     <group col="4">
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 4f0577464e1..46aabde5be0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Output Operation" version="7.0">
                     <header>
-                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_form_button_active_flow" />
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_highlight" />
                     </header>
                     <group col="4" string="Describe why you take money from the cash register:">
                         <field name="name"/>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 1cca490f6ea..293e95ad056 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -11,9 +11,9 @@
                 <form string="Close Cash Registers" version="7.0">
                     <header>
                         <button name="close_statement" string="Yes"
-                             type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                             type="object" icon="gtk-ok" class="oe_highlight"/>
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
-                            string="No" invisible="not context.get('cancel_action')" class="oe_form_button_active_flow"/>
+                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight"/>
                     </header>
                     <separator string="Do you want to close your cash registers?"/>
                     <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index c2d6a34e121..b6f95c32419 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Post All Orders" version="7.0">
                     <header>
-                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Generate Journal Entries"/>
                     <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 117b7484b90..39a292455e9 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -11,7 +11,7 @@
                 <form string="POS Details" version="7.0">
                     <header>
                             <button name="print_report" string="Print Report"
-                                    colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                                    colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group col="4" string="Dates">
                         <field name="date_start"/>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 3146b714ce4..c4bd77ab220 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Apply Discount" version="7.0">
                     <header>
-                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <field name="discount"/>
                 </form>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 8c7b433268c..4630498abf6 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -11,7 +11,7 @@
                 <form string="Open Statements" version="7.0">
                     <header>
                          <button name="open_statement" string="Open Registers"
-                             type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                             type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Do you want to open cash registers?"/>
                     <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 77d5965fa80..58be64d465c 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Add payment :" version="7.0">
                 <header>
-                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="journal"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 85cdfc68f3d..579b7a84cbc 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_form_button_active_flow"/>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print"class="oe_highlight"/>
                     </header>
                 </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index dc8bbaeefef..2a3846121a8 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Pyament Report " version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                 </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 6c785c9662d..75476d748f0 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="user_id"/>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 9d9bd1c59b9..2508724bbc9 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -11,7 +11,7 @@
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
                     <header>
-                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <label string="Print the Receipt of the Sale"/>
                 </form>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 9d6f6203822..68ccd110e14 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <header>
-                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_form_button_active_flow"/>
+                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_highlight"/>
                     </header>
                  </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index 0e50b44991f..dad172d610a 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -11,7 +11,7 @@
                 <form string="Sale By User" version="7.0">
                     <header>
                         <button name="print_report" string="Print Report"
-                            type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date_start"/>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 3f6f9c04b63..b1b763f4812 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -19,7 +19,7 @@
                 <form string="Add Portal Access" version="7.0">
                     <header>
                         <button string="Send Invitations"
-                            name="action_create" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            name="action_create" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 8551673c925..8e66d3ff2aa 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
                     <header>
-                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 3e205659da2..8407662ef09 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -12,7 +12,7 @@
                 <form string="Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Procurements"
-                            type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                            type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <label string="This wizard will schedule procurements."/>
                 </form>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 326022e5af1..5599bab12f7 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     <group col="2">
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index c9e70ef6678..0e2e8cf51d6 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 2a7cb5f3224..14ad2217b75 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -11,7 +11,7 @@
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
                     <header>
-                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index ea99cc13b49..33492f787f5 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_highlight"/>
                     </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index d6c60cee277..3f658457fb5 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" 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">
                         <separator string="Project" colspan="4"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 79b13c9e258..67500a0b7ed 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 80e2847b508..9504296e941 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 7fc3282064a..dfb41206552 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                     <header>
-                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_form_button_active_flow"/>
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_highlight"/>
                     </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 7502fd68076..91d06bdb52b 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 5b5de0ed072..c42b3dbc674 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_form_button_active_flow"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index e4d176713c3..8306dd11d30 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" 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">
                         <separator string="Invoicing" colspan="4"/>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index da4db680da1..b8977795383 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <header>
-                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 25117249f9a..9da3220057a 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
                     <header>
-                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_form_button_active_flow"/>
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_highlight"/>
                     </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index a640ec37444..fda497a1a1f 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="partner_id"/>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index c913dede815..847e2b53748 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
                     <header>
-                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="print_button"/>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index ee0d07d72cf..7dac4295849 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
              <form string="Create invoices" version="7.0">
                 <header>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
                 <separator string="Do you really want to create the invoice(s)?" />
             </form>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ba208325fd7..6abd4367243 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Create invoices" version="7.0">
                     <header>
-                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                     </header>
                     <separator colspan="4" string="Do you really want to create the invoice(s)?" />
                     <group>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index e2162e9447c..ab25bc4058d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Advance Invoice" version="7.0">
                     <header>
-                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_form_button_active_flow"/>
-                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_form_button_active_flow"/>
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_highlight"/>
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 7ba3d139a60..a5947bb1515 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -10,7 +10,7 @@
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
                 <header>
-                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_form_button_active_flow"/>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 486c207d751..84aef1e37c0 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +30,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 28940cbec2c..1cd7ada7fab 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" 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">
                         <separator string="Traceability" colspan="4"/>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 8942ec50542..eaa5efbb58f 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
                     <header>
-                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index f76c7b7d057..604d3015495 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
                   <header>
-                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight"/>
                   </header>
                   <separator string="Change Price"/>
                   <group>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 6a798d52d33..d0c412a0716 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
                   <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index 9343697fcc6..b42445c639b 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 1e106320d97..a43beff76f5 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
                     <header>
-                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
                     <separator string="Merge Inventories" />
                     <label string="Do you want to merge theses inventories?"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index e509d7f5b70..be95fb79a0e 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
                   <header>
-                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                   </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 0af746ae45c..1ddab10aa6c 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 8f4c4897b14..ae1c2b10aaf 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
                     <header>
-                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Consume Products"/>
                     <div>
@@ -42,7 +42,7 @@
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
                     <header>
-                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Scrap Products"/>
                     <group>
@@ -74,7 +74,7 @@
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" readonly="1"/>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index c2754d1966e..8dd27eb030d 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -22,7 +22,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <separator string="Products"/>
                     <field name="move_ids"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 25b3a58283e..7971f2e8202 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                         <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index bc785c71a8a..1cefaa820c8 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -60,7 +60,7 @@
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <header>
-                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
                     <group>
                         <label string="Provide the quantities of the returned products."/>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 88ce97a0a9b..cb0ad239206 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
                 <header>
-                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 57e25d363d8..9b45a0aaa10 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,9 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <header>
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_form_button_active_flow"/>
-                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_form_button_active_flow"/>
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_form_button_active_flow"/>
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_highlight"/>
+                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date_start"/>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 5e63e09a635..0b83403e58c 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 833ccbe56d5..1267038ebe0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
                     <header>
-                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="period_id"/>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 0bb6e984c59..625d51c00e1 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -13,7 +13,7 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator colspan="4"  string =  "Select Survey and Related Answer"/>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 9217f1c65af..f2c13012bdb 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
                     <header>
-                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 4fd4ef253a3..2594dc5d128 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index adec62db305..b243d9e64ad 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
                     <field name="survey_ids"/>
                 </form>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 3f06cbb802e..f020e050dcc 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -12,7 +12,7 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight"/>
                     </header>
                     <group string="Select Survey">
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 6e10b5955e6..c508b6d2e01 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index e49118233ef..9ba03b7e408 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
                     <header>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_form_button_active_flow"/>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Menu Information" colspan="4" />
                     <field name="menu_name" />
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 9013f1b1839..c3c17d935c9 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
                     <header>
-                        <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
 	                <separator string="Menu Information" colspan="4"/>
 	                <label string="Want to create a Index on Selected Pages ? "/>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 3127e2429f0..853311c5cf9 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Open Page" version="7.0">
                     <header>
-                        <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                        <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="" colspan="6" />
                     <label string="Want to open a wiki page? "/>