diff --git a/openerp/addons/base/ir/wizard/wizard_menu_view.xml b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
index 425dd02a88b..119d97689e8 100644
--- a/openerp/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/openerp/addons/base/ir/wizard/wizard_menu_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
                     <header>
-                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight_editable" />
+                        <button name="menu_create" string="Create _Menu" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="name"/>
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 41e32d49bd0..2d16687f418 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -114,8 +114,8 @@
             <field name="arch" type="xml">
                 <form string="Module" version="7.0">
                 <header>
-                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight_editable" />
-                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight_editable" />
+                    <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight_on_dirty"  />
+                    <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight_on_dirty"  />
                     <button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
                         confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
                     <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index a9f2251f1b0..5d23be786c3 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Export Translations" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="8">
                         <group colspan="3">
diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index ae7235ab026..41a992cedbc 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Import Translation" version="7.0">
                     <header>
-                        <button name="import_lang" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_editable" />
+                        <button name="import_lang" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <separator string="Import Translation" colspan="2"/>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index df2dbb399e7..9590dddd4b3 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Load Official Translation" version="7.0">
                     <header>
-                        <button name="lang_install" string="Load" type="object" icon="gtk-ok" states="init" class="oe_highlight_editable" />
+                        <button name="lang_install" string="Load" type="object" icon="gtk-ok" states="init" class="oe_highlight_on_dirty"  />
                     </header>
                     <group colspan="4" col="8">
                         <group colspan="1">
diff --git a/openerp/addons/base/module/wizard/base_module_import_view.xml b/openerp/addons/base/module/wizard/base_module_import_view.xml
index ce0ba5250cb..a3ee8709f9c 100644
--- a/openerp/addons/base/module/wizard/base_module_import_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_import_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <form string="Import module" version="7.0">
                     <header>
-                        <button name="importzip" string="Import module" type="object" icon="gtk-apply" states="init" class="oe_highlight_editable" />
-                        <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_editable" />
+                        <button name="importzip" string="Import module" type="object" icon="gtk-apply" states="init" class="oe_highlight_on_dirty"  />
+                        <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="8">
                         <group colspan="3" col="1">
diff --git a/openerp/addons/base/module/wizard/base_module_scan_view.xml b/openerp/addons/base/module/wizard/base_module_scan_view.xml
index 0718d92f1e7..3bb0965da0e 100644
--- a/openerp/addons/base/module/wizard/base_module_scan_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_scan_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <form string="Scan for new modules" version="7.0">
                 <header>
-                    <button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok" class="oe_highlight_editable" />
+                    <button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                 </header>
                 <label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
              </form>
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index dd40475746b..93a9554c610 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <form string="Update Module List" version="7.0">
                     <header>
-                        <button name="update_module" string="Update" type="object" icon="gtk-ok" states="init" class="oe_highlight_editable" />
-                        <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_editable" />
+                        <button name="update_module" string="Update" type="object" icon="gtk-ok" states="init" class="oe_highlight_on_dirty"  />
+                        <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="8">
                         <group colspan="3">
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index 5773b51ce5f..772810fdbf4 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -48,7 +48,7 @@ class base_module_upgrade(osv.osv_memory):
         if not ids:
             res['arch'] = '''<form string="Apply Scheduled Upgrades" version="7.0">
                                 <header>
-                                    <button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_highlight_editable"/>
+                                    <button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"/>
                                 </header>
                                 <group>
                                     <separator string="System update completed" colspan="4"/>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 73b518552ca..75e1a658e4e 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="System Update" version="7.0">
                     <header>
-                        <button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
+                        <button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
 	                    <label string="Your system will be updated."/>
@@ -46,7 +46,7 @@
             <field name="arch" type="xml">
                 <form string="Apply Scheduled Upgrades" version="7.0">
                     <header>
-                        <button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_highlight_editable" />
+                        <button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
 	                    <label string="The selected modules have been updated / installed !"/>
diff --git a/openerp/addons/base/module/wizard/base_update_translations_view.xml b/openerp/addons/base/module/wizard/base_update_translations_view.xml
index 54145c168d4..345abd69a59 100644
--- a/openerp/addons/base/module/wizard/base_update_translations_view.xml
+++ b/openerp/addons/base/module/wizard/base_update_translations_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Synchronize Terms" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="act_update" string="Update" type="object" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" name="act_update" string="Update" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="8">
                         <group colspan="3">
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index e2d0a2a7a3a..44a5d85c7aa 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -95,7 +95,7 @@
             <field name="arch" type="xml">
                 <form string="Register a Contract" version="7.0">
                     <header>
-                        <button name="action_validate" string="Register" type="object" icon="gtk-apply" states="draft" class="oe_highlight_editable" />
+                        <button name="action_validate" string="Register" type="object" icon="gtk-apply" states="draft" class="oe_highlight_on_dirty"  />
                     </header>
                     <group colspan="4" col="8">
                         <group colspan="1">
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 816ce382deb..320f37096c5 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -8,7 +8,7 @@
           <form version="7.0">
              <header>
                <button name="action_next" type="object"
-                       string="Apply" icon="gtk-go-forward" class="oe_highlight_editable" />
+                       string="Apply" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
              </header>
              <group string="res_config_contents"/>
           </form>
@@ -23,7 +23,7 @@
         <form string="Next Configuration Step" version="7.0">
             <header>
                 <button name="action_next" type="object"
-                        string="Continue" icon="gtk-go-forward" class="oe_highlight_editable" />
+                        string="Continue" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
             </header>
             <group>
                 <field name="note"/>
@@ -39,7 +39,7 @@
       <field name="arch" type="xml">
         <form version="7.0">
             <header>
-                <button name="action_next" icon="gtk-go-forward" type="object" string="Install Modules"  class="oe_highlight_editable" />
+                <button name="action_next" icon="gtk-go-forward" type="object" string="Install Modules"  class="oe_highlight_on_dirty"  />
             </header>
             <group>
                 <separator string="title" colspan="4"/>
diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml
index 9e456af304a..a4dd472311b 100644
--- a/openerp/addons/base/res/res_widget_view.xml
+++ b/openerp/addons/base/res/res_widget_view.xml
@@ -89,7 +89,7 @@
             <field name="arch" type="xml">
                 <form string="Widget Wizard" col="4" version="7.0">
                     <header>
-                        <button name="res_widget_add" string="Add" type="object" class="oe_highlight_editable" />
+                        <button name="res_widget_add" string="Add" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="widgets_list"/>