diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 00e280f4ca3..ef492f697e4 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index cb72509e70a..de991fe6725 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
@@ -55,7 +55,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index b2f23f0ce73..a1bf809a5c9 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -16,7 +16,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 1e40022171d..32569a3d545 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 0839c93e09c..8f29627734e 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Marketing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <group string="Campaigns">
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 0316992e6dc..353b6c063b6 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index a90ee821454..b1daeb66b22 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 301460d5937..c08c13792c8 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index abc70ca744a..d6caa78cc13 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>