diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 0953bfb3d2e..e42982f3f42 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <header>
-                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 7e4c87f052d..633d15dff17 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
                     <header>
-                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_highlight_on_dirty"  />
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 418aa36227c..6dc8f04f05f 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="partner_id"/>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 78e076b287f..c80a680563c 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
                     <header>
-                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="do_action" type="object" string="_Ok" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="print_button"/>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 95f69b98a26..a9d6d48a594 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
              <form string="Create invoices" version="7.0">
                 <header>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
+                    <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <separator string="Do you really want to create the invoice(s)?" />
             </form>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 0da60260662..1ba5ee29466 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Create invoices" version="7.0">
                     <header>
-                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight_on_dirty"  />
+                        <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator colspan="4" string="Do you really want to create the invoice(s)?" />
                     <group>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 636832a1081..7918c1d1b28 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -8,8 +8,12 @@
             <field name="arch" type="xml">
                 <form string="Advance Invoice" version="7.0">
                     <header>
-                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_highlight_on_dirty"  />
-                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight_on_dirty"  />
+                        <button name="create_invoices" string="Create Invoice" type="object" context="{'open_invoices': False}" class="oe_highlight_on_dirty"  />
+                        or
+                        <button name="create_invoices" string="Create and view Invoice" type="object" context="{'open_invoices': True}" class="oe_highlight_on_dirty"  />
+                        or
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 91a95f5bf51..41bef2545a6 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -10,7 +10,9 @@
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
                 <header>
-                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_highlight_on_dirty"  />
+                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index bc6802ce6f0..246efa01f51 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +32,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>