diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 88abb8fb871..2bc31ec4a97 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -11,7 +11,9 @@
             <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_on_dirty"  />
+                        <button name="action_add" type="object" string="_Add" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 d668a988784..52628035279 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,7 +7,9 @@
           <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_on_dirty"  />
+                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
@@ -37,7 +39,9 @@
 	          <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_on_dirty"  />
+	                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight_on_dirty"/>
+	                        or
+                            <button string="Cancel" class="oe_link" special="cancel" />
 	                    </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 ecec42512c3..c1309c8d0f2 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -10,7 +10,9 @@
           <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_on_dirty"  />
+                      <button name="make_partner" string="Continue" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
                   </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 eb3db02a110..ae87683ee67 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -11,7 +11,9 @@
             <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_on_dirty"  />
+                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 b4bf273af9d..5a5f69fa131 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -11,10 +11,10 @@
             <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_on_dirty"  />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"  />
+                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_on_dirty"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"  />
                         or
-                        <button name="action_cancel" string="_Cancel" class="oe_link" special="cancel" />
+                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
                     </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 e64789a558d..c6e2489e1cf 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -10,7 +10,9 @@
           <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_on_dirty"  />
+                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
                   </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 2e53c6ba4bb..bb8d0730af1 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -13,7 +13,9 @@
                 <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_on_dirty"  />
+                            string="_Schedule" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 680044d8081..1d05ebe0b65 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -11,7 +11,9 @@
             <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_on_dirty"  />
+                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 88b06b14a22..5f3881caa12 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -10,7 +10,9 @@
           <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_on_dirty"  />
+                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group>
                     <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
@@ -29,7 +31,9 @@
           <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_on_dirty"  />
+                    <button name="make_partner" string="Continue" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 c4b6fd757ee..236443754aa 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -11,8 +11,10 @@
             <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_on_dirty"  />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"  />
+                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight_on_dirty"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 0bd62e9bdd4..4d3b80edb5b 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,9 @@
             <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_on_dirty"  />
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 46cc93fa01b..ed2d25e10e9 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="questionnaire_id"/>
@@ -34,7 +36,9 @@
             <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_on_dirty"  />
+                        <button name="questionnaire_compute" string="Save Data" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 b3d34fcbff7..ea3d792f271 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,6 +9,8 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 8732a8ec2d0..e6d6388004f 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+                      <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight_on_dirty"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
                   </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 7101125d6fd..e2f3f51a563 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -9,7 +9,9 @@
                 <form string="Configure Moodle" version="7.0">
                     <header>
                         <button type="object" name="configure_moodle"
-                            string="Configure Moodle" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                            string="Configure Moodle" class="oe_highlight_on_dirty"  />
+                            or
+                            <button string="Cancel" class="oe_link" special="cancel" />
                     </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 a8c7fc78a4d..2611bf7715f 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight_on_dirty"/>
+                       or
+                       <button string="Cancel" class="oe_link" special="cancel" />
                    </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 91d6365dfe8..7b269ecec22 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -8,7 +8,9 @@
             <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_on_dirty"  />
+                        <button name="login" string="_Login" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>