diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e0061c3e94f..75f5db0be83 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_editable" />
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight_on_dirty"  />
                     </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 fc106db9c44..10dd9efc76f 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_editable" />
+                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 5ebf17a3d9d..28a36cdc86b 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_editable" />
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 9cb3f3fadd0..4695ba84108 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_editable" />
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 283f8088b8e..a2568c475bb 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_editable" />
+                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 b587addfade..2b22b555a8e 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_editable" />
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 e76773c2067..2aed3a00ead 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_editable" />
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 1d5e544f3e2..d6434247ef9 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 753e56fece7..3605511436c 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_editable" />
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_on_dirty"  />
                     </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 13286137b53..f912f8c296a 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_editable" />
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_on_dirty"  />
                     </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 b9fec77d8ee..bfbde13a8ab 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </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 f26b7d45281..d4fba3cf328 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_editable" />
+	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight_on_dirty"  />
 	                </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 d557b8f4442..cbea89c451c 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_editable" />
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_highlight_on_dirty"  />
                     </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 993cad6c027..e438cd3e945 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_editable" />
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_highlight_on_dirty"  />
                     </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 ed0dc4b4e76..8edb99b8993 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_editable" />
+	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
 	                </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_editable" />
+	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
 	                </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 c0941129097..b30d92d09be 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_editable" />
+	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
 	                </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 ec7282a6af2..73f1d1131c3 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index fdf27e8cefd..954967df934 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,7 +107,7 @@ class account_move_journal(osv.osv_memory):
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
                 <header>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight_on_dirty"/>
                 </header>
                 <group string="%s" colspan="4">
                     <field name="target_move" />
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 73de3c3d901..142ebfcefb2 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </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 e13fdfabffd..e794876598d 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 7a39ba2f559..c0666cb468d 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </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 416f0808fe2..55650b2d0d3 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_highlight_on_dirty"  />
                     </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 7322d9baffe..93f88a1e684 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_editable" />
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_highlight_on_dirty"  />
                     </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 9dd2d908879..dd0e2a0f5f7 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_editable" />
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight_on_dirty"  />
                     </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 b57e94e6027..5f47b06b9a5 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_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" />
+                        <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_on_dirty"  />
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"  />
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 7facb1ed170..2341bd260cf 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_editable" />
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 55c94316096..76e59d7ec3b 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_editable" />
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"  />
                 </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 77f7efbf7ac..df66c591c16 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_editable" />
+                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
                     </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 2542022610d..64e813800ca 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_editable" />
+                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_highlight_on_dirty"  />
                     </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 d6194c0585a..8f5fcb16cec 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </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 632f5669987..22280c6f9e4 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_editable" />
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                 </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_editable" />
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                 </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 070867bbecc..1366bc9a6a2 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_editable" />
+	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_highlight_on_dirty"  />
 	                </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_editable" />
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight_on_dirty"  />
                     </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 97c0ff073b7..6db87d263c2 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_editable" />
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_highlight_on_dirty"  />
 	                </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_editable" />
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
 	                </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 48ae87d4a3b..7b6b2889acc 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_editable" />
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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 fc45b94b168..71d5f17fbce 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_editable" />
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 a27e6708175..e313747f290 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_editable" />
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight_on_dirty"  />
                 </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 57f9678b468..6608d7cbff3 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_editable" />
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
                     </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 c9dd2c80bd4..1fde17c3a5e 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_editable" />
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_highlight_on_dirty"  />
                     </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 e392d928253..3abda334f0f 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_editable" />
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight_on_dirty"  />
             </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 02bd211d239..e1dfd3525b1 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_editable" />
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
                      </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 d1e8675565a..8aa1f1fae45 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_editable" />
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
                      </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 37d61b81119..64d2593d840 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_editable" />
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
                      </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 7e0b66bd5c7..10c7de0a75d 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_editable" />
+                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
               </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 25c6bc80238..6640c824ba4 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_editable" />
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
             </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_editable" />
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_editable" />
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
           </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 3fca0e34f0d..f3eba9eb07f 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_editable" />
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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_editable" />
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight_editable" />
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 83be7ca7eeb..33a502e8b7f 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_editable" />
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 2d8030e2d4d..313582ffe19 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_editable" />
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
                 </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_editable" />
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
                     </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 0f9119a6f36..3d3608716ed 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_editable" />
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 c996063616a..f3510b9d716 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_editable" />
+                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 5d92bcea319..1c940eedae6 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_editable" />
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_highlight_on_dirty"  />
                     </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 265234d920c..7652d5764cf 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_editable" />
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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 bb64f27515d..2038e8be4bd 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_editable" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight_on_dirty"  />
                     </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 1b08bbcf012..763c55edfdc 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_editable" />
+                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 a150e8f30d4..ee71bfcc838 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_editable" />
+                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 b35ed6d3de6..0d04733f96a 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_editable" />
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_on_dirty"  />
                     </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 7b0c2ef2846..be02a1a1d24 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_editable" />
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 6a9af6d3e93..1c01292a796 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_editable" />
+                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_highlight_on_dirty"  />
                     </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 6c2f775663c..0b2fe2cf530 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_editable" />
+                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_highlight_on_dirty"  />
                             </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 d0a896308ed..53f12399238 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_editable" />
-                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
+                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                 </header>
                 <separator string="Select your report" colspan="4"/>
                 <field name="report_id"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 3c795b547df..03d1d6ac781 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -55,7 +55,6 @@
                 <form string="Configure Sales" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 6813c66cf23..54bd1b3e784 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_editable" />
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_highlight_on_dirty"  />
                     </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 a7b4ec4cd6b..8564e3434af 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_editable" />
+                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 feda73d29ec..567b0d4ba2d 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_editable" />
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class="oe_highlight_on_dirty"  />
                     </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 c8752d69b0f..cc098bce4fa 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_editable" />
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight_on_dirty"  />
                     </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 5ed494c197b..88abb8fb871 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_editable" />
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 0f2df36126a..d668a988784 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_editable" />
+                        <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+	                        <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
 	                    </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 f91d3921154..ecec42512c3 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_editable" />
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                   </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 631bec296cf..eb3db02a110 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_editable" />
+                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 1e7dc312217..27a7d057b23 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_editable" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_editable" />
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_on_dirty"  />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"  />
                     </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 0bb1189367b..e64789a558d 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_editable" />
+                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                   </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 be92a5a8569..2e53c6ba4bb 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_editable" />
+                            string="_Schedule" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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 fc56e702da5..680044d8081 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_editable" />
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_highlight_on_dirty"  />
                     </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 f19db7e5a84..88b06b14a22 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_editable" />
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager" class="oe_highlight_on_dirty"  />
                 </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_editable" />
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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 ffe893f296c..c4b6fd757ee 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_editable" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_editable" />
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_on_dirty"  />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"  />
                     </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 e460ea7a48b..0bd62e9bdd4 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_editable" />
+                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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 b49ec7ae5d3..46cc93fa01b 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_editable" />
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_highlight_on_dirty"  />
                     </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 5189fdabacf..b3d34fcbff7 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_editable" />
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 a093bfc6a41..8732a8ec2d0 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_editable" />
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_highlight_on_dirty"  />
                   </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 14493438ee3..7101125d6fd 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_editable" />
+                            string="Configure Moodle" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 486f2f1311c..a8c7fc78a4d 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_editable" />
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_highlight_on_dirty"  />
                    </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 ad2a7d062cd..91d6365dfe8 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_editable" />
+                        <button name="login" string="_Login" type="object" icon="terp-check" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index c4079b500a1..0c7f0e5dff6 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_editable" />
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 a262a212dd2..c24dba44c26 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_editable" />
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 1e0814f35f0..36701c927eb 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_editable" />
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 af8bbdfe502..120e6a27c06 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_editable" />
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight_editable" />
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_highlight_on_dirty"  />
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_highlight_on_dirty"  />
                     </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 2fe7bc8174d..1ffa5a6b574 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_editable" />
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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 90b1a8ba2d1..aae9573838b 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_editable" />
+                    <button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"  />
                 </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 7415a88d2c5..e7ca0e91dcc 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_editable" />
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 4de84499322..1a0e88e9856 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_editable" />
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                 </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 aca64879bd8..f213f7b5efa 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_editable" />
+                        <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_highlight_on_dirty"  />
                     </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 6ef35ccade8..e1b46a48b3e 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_editable" />
+			        <button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager" class="oe_highlight_on_dirty"  />
 			    </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 29abeaba1a3..96c13695ab0 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_editable" />
+                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
                     <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 193388f5181..a890839d366 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_editable" />
+			        <button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
 			    </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 a129cb64942..2beb1d91dc7 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_editable" />
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"  />
 				    </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_editable" />
+                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"  />
                     </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 1666e5abcdb..80e4dfbf78a 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_editable" />
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"  />
 				    </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 55a34753cd7..4d3f7121c5a 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_editable" />
+                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_highlight_on_dirty"  />
                     </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_editable" />
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_highlight_on_dirty"  />
+                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_on_dirty"  />
                     </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 f6186fc3390..15bf90281ab 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_editable" />
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 26ec3aeb904..bb504727a29 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_editable" />
+                    <button name="do_create" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                 </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 b6a8b86b6d9..4059b539701 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_editable" />
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                 </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 1a301b548c2..150dceb3e92 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_editable" />
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_highlight_on_dirty"  />
                </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 c9d5b8909b6..6b69f9130e8 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_editable" />
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_on_dirty"  />
                     </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 b960592a55f..c6e7ce170cf 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_editable" />
-	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight_editable" />
+	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
+	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
           </header>
           <group col="8" >
             <group colspan="2" col="2" width="200">
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 9b10c7b2e1e..1cfb7112ada 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_editable" />
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 f8ab3cc39fe..bb8ca72eaff 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_editable" />
+            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight_on_dirty"  />
           </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_editable" />
+                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
             </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 8894c8ba509..d0c694b5bf5 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_editable" />
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight_editable" />
+                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
+                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight_on_dirty"  />
                     </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 df85a98fe05..37858e77da8 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_editable" />
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_highlight_on_dirty"  />
                     </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 03f7226d355..1f8237d04a9 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_editable" />
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_highlight_on_dirty"  />
                     </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 650e6d3e91b..acff0988676 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_editable" />
+                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                    </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 88cb2d65b62..c23376db97e 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_editable" />
+                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 1deb77bc5d1..2d4c43703a9 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_editable" />
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                    </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 1bb335dc0b1..25db235a33b 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_editable" />
+                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight_on_dirty"  />
                     </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 f2de4632605..8001c1b7c6d 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_editable" />
+                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_highlight_on_dirty"  />
                     </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 d7465618d76..7a9610e7a02 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_editable" />
+                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_highlight_on_dirty"  />
                     </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 b6780d160f6..bc7ddf244c9 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_editable" />
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 544f956576b..43ce6007e12 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_editable" />
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 4bd7088c380..1b99ea5f7ef 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_editable" />
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 6a060869a66..aa6f9b79ea5 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_editable"  />
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"   />
                     </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 f6f6bc9801c..a8c9c29f418 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_editable" />
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 a1f514701dd..6faa9e09dcd 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_editable" />
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <sheet layout="auto">
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 9c27fe49232..40388d838c3 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -71,7 +71,7 @@ class repair_cancel(osv.osv_memory):
         if not repair_order.invoiced:
             res['arch'] = """ <form string="Cancel Repair" colspan="4">
                               <header>
-                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_highlight"/>
+                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"/>
                               </header>
                             <group col="2" colspan="2">
                                 <label string="Do you want to continue?" colspan="4"/>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index bdd99c947b7..eb05fa3fd67 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_editable"  />
+                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"   />
                     </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 9a6e085e672..f18002f21f4 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_editable" />
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                 </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 925fb2014b2..9402d502394 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_editable"  />
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"   />
                     </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 b5bcc9430f1..91a55a1e42e 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_editable"  />
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"   />
                     </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 f1771240d81..b7c6d100d40 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_editable" />
+                             type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
-                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight_editable" />
+                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight_on_dirty"  />
                     </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 773c0f2f3ba..85b27f7c4ef 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_editable" />
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 49a2a3ab590..aeeaf27234a 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_editable" />
+                                    colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 659dcd0d4c7..4c4b4a3f843 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_editable" />
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 dc147531f18..3ec352a8a21 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_editable" />
+                             type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 be180627366..67c4c7d85ba 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_editable" />
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
                 </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 1140d8d1c73..d07500a4460 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_editable" />
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 03997b4c702..03a7bdfc733 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_editable" />
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 679bb26f44e..5f352a4488a 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_editable" />
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 abd08e8f45a..171c41b5ca0 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_editable" />
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 a682193eaf2..df56fb5e0a8 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_editable" />
+                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_highlight_on_dirty"  />
                     </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 e77e265c30f..303da15fa62 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_editable" />
+                            type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 65a4c408218..37e3598994b 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_editable" />
+                            name="action_create" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 143370dfa3b..ea2f4615ac9 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_editable" />
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 b3e2052c54f..cc23b6b15c7 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_editable" />
+                            type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 d70e24fa7cf..5e179b001cb 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_editable" />
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 9208c76c602..1a20fe2a759 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_editable" />
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 609e5ef5ab1..612a5d80055 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_editable" />
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_highlight_on_dirty"  />
                     </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 56e76f83318..e64eee91d7e 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_editable" />
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9a6ae405768..69d6b2c495e 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_editable" />
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 7f15a7905bd..39e3427ff3b 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_editable" />
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                     </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 adc2da7cc28..1e63624a138 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_editable" />
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_highlight_on_dirty"  />
                     </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 4621aa2946e..2d84ae412c7 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_editable" />
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
                       </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 309fe7e5c6f..32bae94b246 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_editable" />
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight_on_dirty"  />
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 8a268ba956b..0953bfb3d2e 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_editable" />
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 76f6193ab68..7e4c87f052d 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_editable" />
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_highlight_on_dirty"  />
                     </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 89c3b966603..418aa36227c 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_editable" />
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_highlight_on_dirty"  />
                     </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 bba3f160737..78e076b287f 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_editable" />
+                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="print_button"/>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 89f23d536cf..95f69b98a26 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_editable" />
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                 </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 9ff3edafff0..0da60260662 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_editable" />
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                     </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 00965922164..636832a1081 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_editable" />
-                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight_editable" />
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_highlight_on_dirty"  />
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight_on_dirty"  />
                     </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 90fc04c9f3f..91a95f5bf51 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_editable" />
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_highlight_on_dirty"  />
                 </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 0e9f1b14800..bc6802ce6f0 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_editable" />
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 91882de2c30..4e34d7c24fc 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_editable" />
+                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
                     </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 a766e1ba12d..f753e2763f7 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_editable" />
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
                   </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 d23dee68c58..861d88e4445 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_editable" />
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                   </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 220a2f3b1c5..c353ebaaee2 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_editable" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 9d2cf9b6b6d..d2d5430c5c8 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_editable" />
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
                     </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 17e6da62691..ce220702a3f 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_editable" />
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
                   </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 1c60b81756a..dd20db9f146 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_editable" />
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 5eeb20f5e36..ea357a3f510 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_editable" />
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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_editable" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 06ddcb32bba..6fd6d24aabc 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_editable" />
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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 76f849b45fd..35beb164a94 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_editable" />
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </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 41eef010d06..7a15a7b6d3b 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_editable" />
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
                     </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 63438e89334..b05f19c40c8 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_editable" />
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </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 eb78329299e..2b0f2b6b40e 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_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" />
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight_on_dirty"  />
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight_on_dirty"  />
                     </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 ec0a682d08a..5d3948ededd 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_editable" />
+                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_highlight_on_dirty"  />
                     </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 e04d5de643e..200c3c2a330 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_editable" />
+                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_highlight_on_dirty"  />
                     </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 0e45f84a70c..aa212a193bd 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_editable" />
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight_on_dirty"  />
                     </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 9b423881a09..fdcc6e585d4 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_editable" />
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_on_dirty"  />
                     </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 5fb33f34df2..129635785b6 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_editable" />
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_on_dirty"  />
                     </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 9533453ce0a..5d008354831 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_editable" />
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="survey_ids"/>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index e71daa4d8a9..37e88703efa 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_editable" />
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight_on_dirty"  />
                     </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 b0eabf05405..c452e820f34 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_editable" />
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_highlight_on_dirty"  />
                     </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 9baeda96489..58b8c801957 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_editable" />
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight_on_dirty"  />
                     </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 6f9568a8b70..b92575720b1 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_editable" />
+                        <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </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 3535e6f914f..2b5f94560f8 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_editable" />
+                        <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <separator string="" colspan="6" />