diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 0c7f0e5dff6..cfc7ffa859d 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+                    <button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 c24dba44c26..f71d3667f93 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -8,7 +8,9 @@
             <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_on_dirty"  />
+                    <button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 36701c927eb..612193b03f9 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+                    <button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 120e6a27c06..1a2913fbb60 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,11 @@
             <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_on_dirty"  />
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Sign in" name="si_check" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Sign out" name="so_check" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator colspan="4" string="Sign in / Sign out"/>
@@ -55,7 +58,9 @@
             <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_on_dirty"  />
+                        <button string="Sign in" name="sign_in" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 +78,9 @@
             <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_on_dirty"  />
+                        <button string="Sign out" name="sign_out" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 1ffa5a6b574..8b1df495952 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -9,7 +9,9 @@
         <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_on_dirty"  />
+                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 aae9573838b..0c3b2e8d106 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,9 @@
             <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_on_dirty"  />
+                    <button name="print_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 e7ca0e91dcc..73a7997a57b 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,9 @@
             <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_on_dirty"  />
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
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 e1b46a48b3e..df793449d80 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,9 @@
             <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_on_dirty"  />
+			        <button name="make_order" string="Create Contact" colspan="1" type="object" groups="base.group_partner_manager" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
 			    </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 96c13695ab0..9281fc0e1d5 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -9,8 +9,11 @@
             <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_on_dirty"  />
-                    <button name="case_close" string="No" icon='gtk-no' type="object"/>
+                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" class="oe_highlight_on_dirty" />
+                    or
+                    <button name="case_close" string="No" type="object"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group>
                     <label string="Would you like to create an employee ?" colspan="4" />
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index a890839d366..756096b0d9b 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -9,7 +9,9 @@
             <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_on_dirty"  />
+			        <button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
 			    </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 2beb1d91dc7..18226e22fe6 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,9 @@
             <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_on_dirty"  />
+				        <button string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
 				    </header>
 					<group colspan="4">
 						<field name="month"/>
@@ -44,7 +46,9 @@
             <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_on_dirty"  />
+                        <button string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 80e4dfbf78a..eb8acca4b5c 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,9 @@
             <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_on_dirty"  />
+				        <button string="Print" name="print_report" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
 				    </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 4d3f7121c5a..2c2ca55cc86 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,9 @@
             <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_on_dirty"  />
+                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
@@ -25,7 +27,9 @@
             <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_on_dirty"  />
+                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
@@ -57,8 +61,11 @@
             <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_on_dirty"  />
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 15bf90281ab..c799c9d75c3 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,9 @@
             <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_on_dirty"  />
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </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 bb504727a29..15177708ed3 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,9 @@
             <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_on_dirty"  />
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </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 42918b300a9..555b14ac06c 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,9 @@
             <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_on_dirty"  />
+                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <notebook>
                     <page string="Billing Data">
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 150dceb3e92..c88c8006f55 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,9 @@
         <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_on_dirty"  />
+                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                </header>
                <group>
                     <separator string="It will open your current timesheet"/>