diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d4f73401c13..5f064db9920 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1983,7 +1983,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_highlight"/>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight_editable" />
                     </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 f12999e3031..fc106db9c44 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_highlight"/>
+                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 8f497003c57..5ebf17a3d9d 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_highlight"/>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 1637398af90..9cb3f3fadd0 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_highlight"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 cd730ce628c..283f8088b8e 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_highlight"/>
+                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 73c66103b74..b587addfade 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_highlight"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 e623e79d2d1..e76773c2067 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_highlight"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 f6b4c3aabdb..1d5e544f3e2 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_editable" />
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 0d602e596ee..04e83b324bc 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </header>
                     <group col="4">
                         <field name="has_default_company" invisible="1" />
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 008c454bb92..753e56fece7 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_highlight"/>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_editable" />
                     </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 752c5bed915..13286137b53 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_highlight"/>
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_editable" />
                     </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 a09c49257f8..b9fec77d8ee 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight_editable" />
                     </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 0e6243327ac..f26b7d45281 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_highlight"/>
+	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight_editable" />
 	                </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 6538ed3ff0d..d557b8f4442 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_highlight"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_highlight_editable" />
                     </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 c393c2f0202..993cad6c027 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_highlight"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_highlight_editable" />
                     </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 2a4fd3bb5d6..ed0dc4b4e76 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_highlight"/>
+	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight_editable" />
 	                </header>
 	                <group>
 	                    <separator string="Confirm Draft Invoices" colspan="4"/>
@@ -30,7 +30,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_highlight"/>
+	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight_editable" />
 	                </header>
 	                <group>
 	                    <separator string="Cancel Selected Invoices" colspan="4"/>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index c30b494d840..c0941129097 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_highlight"/>
+	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_editable" />
 	                </header>
 	                <group>
 	                    <label string="Are you sure you want to open Journal Entries?"/>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 62e12534fe5..ec7282a6af2 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight_editable" />
                     </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 aa6da30ea75..73de3c3d901 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight_editable" />
                     </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 c2ffa48f27c..e13fdfabffd 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="Are you sure you want to open Account move line entries!"/>
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 1d1c0c6738c..7a39ba2f559 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight_editable" />
                     </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 c1308a2c971..416f0808fe2 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_highlight_editable" />
                     </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 dc5a01f7700..7322d9baffe 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_highlight"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_highlight_editable" />
                     </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 7fd3def218f..9dd2d908879 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_highlight"/>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight_editable" />
                     </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 dc13ae1caaf..b57e94e6027 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_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"/>
+                        <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_editable" />
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight_editable" />
                     </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 02064472160..7facb1ed170 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_highlight"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_editable" />
                     </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 c8bf4c935a1..55c94316096 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_highlight"/>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_editable" />
                 </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 6035c30afc8..77f7efbf7ac 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_highlight"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="Are you sure you want to open this invoice ?"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 4940dd7b448..2542022610d 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_highlight"/>
+                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_highlight_editable" />
                     </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 2bae500bb56..d6194c0585a 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight_editable" />
                     </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 023066d1a74..632f5669987 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_highlight"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight_editable" />
                 </header>
                 <group>
                     <separator string="Unreconciliate Transactions"/>
@@ -44,7 +44,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_highlight"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight_editable" />
                 </header>
                 <group>
                     <separator string="Unreconciliation Transactions"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 14a3c42f64f..070867bbecc 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_highlight"/>
+	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_highlight_editable" />
 	                </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_highlight"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string = "Are you sure you want to create entries?"/>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 714aa67a8a1..97c0ff073b7 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_highlight"/>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_highlight_editable" />
 	                </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_highlight"/>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight_editable" />
 	                </header>
 	                <group>
 	                    <separator string="Post Journal Entries"/>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index ba13b17bb46..48ae87d4a3b 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_highlight"/>
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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 8b4d290c76b..fc45b94b168 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_highlight"/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 6fff5bf2b1d..a27e6708175 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_highlight"/>
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight_editable" />
                 </header>
                 <group>
                     <label string="Save This Distribution as a Model"/>
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 e23c9d85079..57f9678b468 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_highlight"/>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_highlight_editable" />
                     </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 b3114dde5fa..c9dd2c80bd4 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_highlight"/>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_highlight_editable" />
                     </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 5d73127e45a..e392d928253 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_highlight"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight_editable" />
             </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 4653ba8e686..02bd211d239 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_highlight"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_editable" />
                      </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 65e7d82d86e..d1e8675565a 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_highlight"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_editable" />
                      </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 f442a34be9a..37d61b81119 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_highlight"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_editable" />
                      </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 da32ef5dae3..7e0b66bd5c7 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_highlight"/>
+                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_editable" />
               </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 84714ab5c71..25c6bc80238 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_highlight"/>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_editable" />
             </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_highlight"/>
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight"/>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_editable" />
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_editable" />
           </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 3509956512f..3fca0e34f0d 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_highlight"/>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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."/>
@@ -76,8 +76,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_highlight"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_editable" />
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 2c000bcdca0..83be7ca7eeb 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_highlight"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 a4e49149c16..2d8030e2d4d 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_highlight"/>
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_editable" />
                 </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_highlight"/>
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Entries"/>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 032790b401e..0f9119a6f36 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_highlight"/>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Are you sure you want to make payment?"/>
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 f99059c8166..c996063616a 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_highlight"/>
+                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="lines"/>
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 2674e8f336d..5d92bcea319 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_highlight"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_highlight_editable" />
                     </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 e1fd6cfb07a..265234d920c 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_highlight"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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 232b15d6c72..bb64f27515d 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_highlight"/>
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight_editable" />
                     </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 dd61e54d09a..1b08bbcf012 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_highlight"/>
+                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 02937df25bc..a150e8f30d4 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_highlight"/>
+                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 100de20ca28..b35ed6d3de6 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_highlight"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_editable" />
                     </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 9fc5d3f62b5..7b0c2ef2846 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_highlight"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_editable" />
                     </header>
                     <group> 
                         <field name="check_date"/>
@@ -86,7 +86,7 @@
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <header>
-                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight"/>
+                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <separator string="Module Information" colspan="4"/>
                     <field name="name"/>
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 6c4e7deb9f0..6a9af6d3e93 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_highlight"/>
+                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_highlight_editable" />
                     </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 c7f705b277d..6c2f775663c 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_highlight"/>
+                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_highlight_editable" />
                             </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 14f18949ffb..d0a896308ed 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_highlight"/>
-                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_editable" />
+                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                 </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 0e83fbf9e2b..f6275f8567b 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -50,7 +50,7 @@
         <field name="arch" type="xml">
             <form string="Configure Sales" version="7.0">
                 <header>
-                    <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                    <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                 </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 1c81907fd0f..e63e71b7f09 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 38848e0f141..6813c66cf23 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_highlight"/>
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_highlight_editable" />
                     </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 4393e2d8657..a7b4ec4cd6b 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_highlight"/>
+                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 ccda19944a9..feda73d29ec 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -8,7 +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_highlight"/>
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class="oe_highlight_editable" />
                     </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 0d427824e26..c8752d69b0f 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_highlight"/>
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight_editable" />
                     </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 591103aa7b7..5ed494c197b 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_highlight"/>
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Add Note"/>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index c92f92d686f..0f2df36126a 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_highlight"/>
+                        <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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_highlight"/>
+	                        <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_highlight_editable" />
 	                    </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 14f1ab44c30..f91d3921154 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_highlight"/>
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                   </header>
                   <group col="4">
                       <separator string="Create a Partner"/>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 29b11b1ee25..631bec296cf 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_highlight"/>
+                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Select Opportunities"/>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index a5dd9c69d13..1e7dc312217 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_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_editable" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_editable" />
                     </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 2cc8825078f..0bb1189367b 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_highlight"/>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                   </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 a115a2d8f5e..be92a5a8569 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_highlight"/>
+                            string="_Schedule" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </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 0bedfc34dc8..fc56e702da5 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_highlight"/>
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_highlight_editable" />
                     </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 f8ac04e16ac..f19db7e5a84 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" class="oe_highlight"/>
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager" class="oe_highlight_editable" />
                 </header>
                 <group>
                     <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
@@ -29,7 +29,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_highlight"/>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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 0dce7a02003..ffe893f296c 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_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_editable" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_editable" />
                     </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 de078c48825..e460ea7a48b 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_highlight"/>
+                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </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 f9193e18c9d..b49ec7ae5d3 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_highlight"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_highlight_editable" />
                     </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 2bbdb02291b..5189fdabacf 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_highlight"/>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 e6257009353..a093bfc6a41 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_highlight"/>
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_highlight_editable" />
                   </header>
                   <group>
                     <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 3a4e46809b4..14493438ee3 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_highlight"/>
+                            string="Configure Moodle" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 3c8fce29870..486f2f1311c 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_highlight"/>
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_highlight_editable" />
                    </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 67d071d23b6..ad2a7d062cd 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_highlight"/>
+                        <button name="login" string="_Login" type="object" icon="terp-check" class="oe_highlight_editable" />
                     </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 9c9fd628a6b..8d258441d20 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 73b96b0654a..c4079b500a1 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_highlight"/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight_editable" />
                 </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 9ccad725434..a262a212dd2 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_highlight"/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight_editable" />
                 </header>
                 <group>
                     <field name="init_date"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 6aa0144a351..1e0814f35f0 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_highlight"/>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 c5050b499bd..af8bbdfe502 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_highlight"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight"/>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_highlight_editable" />
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator colspan="4" string="Sign in / Sign out"/>
@@ -55,7 +55,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_highlight"/>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_highlight_editable" />
                     </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" />
@@ -73,7 +73,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_highlight"/>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_highlight_editable" />
                     </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 137138f6b54..2fe7bc8174d 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_highlight"/>
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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 f5505267340..90b1a8ba2d1 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_highlight"/>
+                    <button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_highlight_editable" />
                 </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 c773150a995..7415a88d2c5 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_highlight"/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 ee76c425ab9..4de84499322 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_highlight"/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                 </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 048780b6a5c..aca64879bd8 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_highlight"/>
+                        <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <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." />
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 597758db1b0..6ef35ccade8 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_highlight"/>
+			        <button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager" class="oe_highlight_editable" />
 			    </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 0e760a3a511..29abeaba1a3 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_highlight"/>
+                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_highlight_editable" />
                     <button name="case_close" string="No" icon='gtk-no' type="object"/>
                 </header>
                 <group>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index c40169e77ed..193388f5181 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_highlight"/>
+			        <button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_editable" />
 			    </header>
 			    <group col="4" colspan="6">
                     <separator string="Phone Call Description" colspan="4" />
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 197060d092a..a129cb64942 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_highlight"/>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_editable" />
 				    </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_highlight"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_editable" />
                     </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 6d6f8f93e7f..1666e5abcdb 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_highlight"/>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_editable" />
 				    </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 48e608991a8..55a34753cd7 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_highlight"/>
+                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
@@ -25,7 +25,7 @@
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <header>
-                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_highlight_editable" />
                     </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
@@ -57,8 +57,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_highlight"/>
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_editable" />
                     </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 a286938330d..f6186fc3390 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_highlight"/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 db33fc98aa7..26ec3aeb904 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_highlight"/>
+                    <button name="do_create" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                 </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 0d72d09569e..b6a8b86b6d9 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_highlight"/>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                 </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 2c18c2353c0..1a301b548c2 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_highlight"/>
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_highlight_editable" />
                </header>
                <group>
                     <separator string="It will open your current timesheet"/>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 8a9eed7fcb1..c9d5b8909b6 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_highlight"/>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_editable" />
                     </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 82581da047b..b960592a55f 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_highlight"/>
-	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight"/>
+	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_highlight_editable" />
+	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight_editable" />
           </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 3deda45ff0d..36cbf9ed617 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 f44218561ed..9b10c7b2e1e 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_highlight"/>
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight_editable" />
                     </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 d8deb69c7a1..f8ab3cc39fe 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_highlight"/>
+            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight_editable" />
           </header>
           <group>
             <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
@@ -66,7 +66,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_highlight"/>
+                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_highlight_editable" />
             </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 03a77e88950..8894c8ba509 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_highlight"/>
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight"/>
+                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_highlight_editable" />
+                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 85c8f6caa57..df85a98fe05 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_highlight"/>
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_highlight_editable" />
                     </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 28679e69ee8..03f7226d355 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_highlight"/>
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_highlight_editable" />
                     </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 a31db83e899..650e6d3e91b 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_highlight"/>
+                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                    </header>
                    <group>
                         <field name="fiscalyear_id"/>
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 68cf0fe3861..88cb2d65b62 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_highlight"/>
+                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="fiscalyear_id"/>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 56d2865a81c..1deb77bc5d1 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_highlight"/>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                    </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 a63d0a98480..1bb335dc0b1 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_highlight"/>
+                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index aa653c60cde..f2de4632605 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_highlight"/>
+                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_highlight_editable" />
                     </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 a92e7a9a916..d7465618d76 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_highlight"/>
+                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_highlight_editable" />
                     </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 47f5f6509b1..b6780d160f6 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_highlight"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_editable" />
                     </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 435708224d0..491117231c3 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 461e712260a..544f956576b 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_highlight"/>
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_highlight_editable" />
                     </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 bdf0e977005..6ce4b4dcd03 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 b2dce37cf4c..4bd7088c380 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_highlight"/>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index e48346ba89e..6a060869a66 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_highlight" />
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable"  />
                     </header>
                     <group>
                         <separator colspan="4" string="Print Cost Structure of Product." />
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 6b99c5b19a9..f6f6bc9801c 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_highlight"/>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Produce" colspan="4"/>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b4a4fe05342..a1f514701dd 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_highlight"/>
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <sheet layout="auto">
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index 75a3f004f20..bdd99c947b7 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_highlight" />
+                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_highlight_editable"  />
                     </header>
                     <newline/>
                     <group>
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 a65c3c3f02b..9a6e085e672 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -11,7 +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_highlight"/>
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                 </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 8e58cbc5adb..925fb2014b2 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_highlight" />
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight_editable"  />
                     </header>
                     <group>
                         <separator string="Fill in this form if you put money in the cash register:"/>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 46aabde5be0..b5bcc9430f1 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_highlight" />
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_highlight_editable"  />
                     </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 293e95ad056..f1771240d81 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_highlight"/>
+                             type="object" icon="gtk-ok" class="oe_highlight_editable" />
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
-                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight"/>
+                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight_editable" />
                     </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 b6f95c32419..773c0f2f3ba 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_highlight"/>
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 39a292455e9..49a2a3ab590 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_highlight"/>
+                                    colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 4b654de3ab7..659dcd0d4c7 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_highlight"/>
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="discount"/>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 4630498abf6..dc147531f18 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_highlight"/>
+                             type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 58be64d465c..be180627366 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_highlight"/>
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_highlight_editable" />
                 </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 fe2157370a1..1140d8d1c73 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Payment Report" version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 2a3846121a8..03997b4c702 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_highlight"/>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 75476d748f0..679bb26f44e 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_highlight"/>
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </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 fc9bbfe7a5d..abd08e8f45a 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_highlight"/>
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 68ccd110e14..a682193eaf2 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_highlight"/>
+                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_highlight_editable" />
                     </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 dad172d610a..e77e265c30f 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_highlight"/>
+                            type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 b1b763f4812..65a4c408218 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_highlight"/>
+                            name="action_create" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 5e533cc239a..143370dfa3b 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_highlight"/>
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
                      <group>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 95f60581511..b3e2052c54f 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_highlight"/>
+                            type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="This wizard will schedule procurements."/>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 0aaeb848853..d70e24fa7cf 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_highlight"/>
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 0e2e8cf51d6..9208c76c602 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_highlight"/>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 14ad2217b75..609e5ef5ab1 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_highlight"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_highlight_editable" />
                     </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 33492f787f5..56e76f83318 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_highlight"/>
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_highlight_editable" />
                     </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 3f658457fb5..136911a50f1 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 67500a0b7ed..9a6ae405768 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_highlight"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 9504296e941..7f15a7905bd 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_highlight"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_editable" />
                     </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 dfb41206552..adc2da7cc28 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_highlight"/>
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_highlight_editable" />
                     </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 91d06bdb52b..4621aa2946e 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_highlight"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_editable" />
                       </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 c42b3dbc674..309fe7e5c6f 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_highlight"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_editable" />
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0d39f9b7388..f86c2fbc500 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -133,14 +133,14 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight_editable" />
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight_editable" />
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight_editable" />
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index a8f845533a1..1e148e3ed2c 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 b8977795383..8a268ba956b 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_highlight"/>
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 9da3220057a..76f6193ab68 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_highlight"/>
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_highlight_editable" />
                     </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 fda497a1a1f..89c3b966603 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_highlight"/>
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_highlight_editable" />
                     </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 847e2b53748..bba3f160737 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_highlight"/>
+                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="print_button"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2b9deddb76c..ee9e17d8ae8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -107,13 +107,13 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight_editable" />
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
-                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight_editable" />
+                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight_editable" />
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight_editable"  type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                           attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 7dac4295849..89f23d536cf 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_highlight"/>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                 </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 6abd4367243..9ff3edafff0 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_highlight"/>
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                     </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 ab25bc4058d..00965922164 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_highlight"/>
-                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight"/>
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_highlight_editable" />
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight_editable" />
                     </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 a5947bb1515..90fc04c9f3f 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_highlight"/>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_highlight_editable" />
                 </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 b62a05549a2..0e9f1b14800 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_highlight"/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </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_highlight"/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 1cd7ada7fab..58c32eb1bb9 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_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </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 eaa5efbb58f..91882de2c30 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_highlight"/>
+                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_editable" />
                     </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 604d3015495..a766e1ba12d 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_highlight"/>
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_editable" />
                   </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 d0c412a0716..d23dee68c58 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_highlight"/>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                   </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 b42445c639b..220a2f3b1c5 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_highlight"/>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 f9d0ba4aeff..9d2cf9b6b6d 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_highlight"/>
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Merge Inventories" />
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index be95fb79a0e..17e6da62691 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_highlight"/>
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_editable" />
                   </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 90728d302d5..1c60b81756a 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_highlight"/>
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Stock Location Analysis"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b7642bd4a51..5eeb20f5e36 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_highlight"/>
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Consume Products"/>
@@ -44,7 +44,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_highlight"/>
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <separator string="Scrap Products"/>
                     <group>
@@ -76,7 +76,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_highlight"/>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </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 41340fd36eb..06ddcb32bba 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_highlight"/>
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Products"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 23bd96b6efe..76f849b45fd 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_highlight"/>
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="hide_tracking" invisible="1"/>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 1cefaa820c8..41eef010d06 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_highlight"/>
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_highlight_editable" />
                     </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 cb0ad239206..63438e89334 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_highlight"/>
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                 </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 9b45a0aaa10..eb78329299e 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_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"/>
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_highlight_editable" />
+                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight_editable" />
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight_editable" />
                     </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 0b83403e58c..ec0a682d08a 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_highlight"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_highlight_editable" />
                     </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 1267038ebe0..e04d5de643e 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_highlight"/>
+                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_highlight_editable" />
                     </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 625d51c00e1..0e45f84a70c 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_highlight"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight_editable" />
                     </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 f2c13012bdb..9b423881a09 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_highlight"/>
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_editable" />
                     </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 2594dc5d128..5fb33f34df2 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_highlight"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_editable" />
                     </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 ba0ef18bc05..9533453ce0a 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_highlight"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="survey_ids"/>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index f020e050dcc..e71daa4d8a9 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_highlight"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight_editable" />
                     </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 c508b6d2e01..b0eabf05405 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_highlight"/>
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_highlight_editable" />
                     </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 010e99dd3f2..9baeda96489 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_highlight"/>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="Menu Information" colspan="4" />
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 8ebf1b30ea4..6f9568a8b70 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_highlight"/>
+                        <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
 	                    <separator string="Menu Information" colspan="4"/>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index eaacff551d9..3535e6f914f 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_highlight"/>
+                        <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <separator string="" colspan="6" />