diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index ef492f697e4..a27513a9f0c 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -18,7 +18,7 @@
                 <form string="Configure Accounting" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                     <field name="has_default_company" invisible="1" />
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index de991fe6725..93523f06746 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Company Settings">
@@ -56,7 +56,7 @@
                 <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"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <field name="module_crm" invisible="1"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index a1bf809a5c9..f96f4a80ab2 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -17,7 +17,7 @@
                 <form string="Configure Human Resources" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Additional Features">
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 32569a3d545..80d13e6283a 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 8f29627734e..83053afe614 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Marketing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <group string="Campaigns">
                         <field name="module_marketing_campaign"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 353b6c063b6..da1243452b1 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Manufacturing Order">
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index b1daeb66b22..28258c483ce 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Project">
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c08c13792c8..1afd2d04a90 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Purchases" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Invoicing">
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index d6caa78cc13..2f3a4214af8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -10,7 +10,7 @@
                 <form string="Configure Warehouse" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Traceability">