diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 73c9652f8fa..62a7a7dcbf2 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -22,7 +22,7 @@
                         <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                         <label for="date_start" string="Date Range"/>
                         <div>
-                            <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
+                            <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/>
                             <field name="date_stop" class="oe_inline"/>
                         </div>
                         <field name="period"/>
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index 10dd9efc76f..9e38b654ecb 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                    <button name="check_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="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index 28a36cdc86b..090659510d5 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account Charts" version="7.0">
                     <header>
-                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group string="Select the Period for Analysis" col="4">
                         <field name="from_date"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 4695ba84108..87e66cee39d 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Select period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="check_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group string="Cost Ledger for Period" col="4">
                         <field name="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index a2568c475bb..3fec9f29a0d 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                     <button name="check_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="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 2b22b555a8e..15ed9d978a2 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="check_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="date1"/>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 2aed3a00ead..a72ff34efff 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="check_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="date1"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index d6434247ef9..66f145bfde5 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="View Account Analytic Lines" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 3605511436c..9a10813a02c 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_on_dirty"  />
+                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index f912f8c296a..ca0496a3a62 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <header>
-                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight_on_dirty"  />
+                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index bfbde13a8ab..d527979e12e 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index cbea89c451c..78fbbbf587b 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Create" name="data_save" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index e438cd3e945..ace3366394c 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
                     <header>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_highlight_on_dirty"  />
+                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 8edb99b8993..509efc408ec 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
 	            <form string="Confirm Draft Invoices" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+	                    <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <group>
 	                    <separator string="Confirm Draft Invoices" colspan="4"/>
@@ -30,7 +32,9 @@
             <field name="arch" type="xml">
 	            <form string="Cancel Selected Invoices" version="7.0">
 	                <header>
-	                    <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+	                    <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <group>
 	                    <separator string="Cancel Selected Invoices" colspan="4"/>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index b30d92d09be..e140abee2b2 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
 	            <form string="Journal Select" version="7.0">
 	                <header>
-	                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
+	                    <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <group>
 	                    <label string="Are you sure you want to open Journal Entries?"/>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 73f1d1131c3..1b7b86059a1 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 954967df934..0357f7041bd 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,7 +107,9 @@ class account_move_journal(osv.osv_memory):
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
                 <header>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight_on_dirty"/>
+                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <group string="%s" colspan="4">
                     <field name="target_move" />
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 142ebfcefb2..e3d62fcd433 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                          <field name="account_id"/>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index e794876598d..7a8c1d081e0 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+                        <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <label string="Are you sure you want to open Account move line entries!"/>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index c0666cb468d..744ceb617b9 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="account_id"/>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 55650b2d0d3..30f68958de2 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open" name="remove_entries" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 93f88a1e684..4a9ec943fa9 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
                     <header>
-                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Close Period" name="data_save" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Are you sure?" colspan="4"/>
                     <group>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 5f47b06b9a5..b051c390eef 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -9,9 +9,11 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight_on_dirty"  />
-                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"  />
-                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"  />
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight_on_dirty"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
@@ -50,7 +52,9 @@
             <field name="arch" type="xml">
                 <form string="Information addendum" version="7.0">
                     <header>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+                        <button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group string="Write-Off Move" col="4">
                         <field name="journal_id"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 2341bd260cf..dd6b49f13c4 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"  />
+                        <button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 76e59d7ec3b..2fa33b5ed04 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
                 <header>
-                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"  />
+                    <button name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight_on_dirty"/>
+                    or 
+                    <button string="Cancel" class="oe_link" special="cancel" />
                 </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index df66c591c16..b30d35f67dd 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
                     <header>
-                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
+                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <label string="Are you sure you want to open this invoice ?"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 64e813800ca..dca8659cf0d 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 8f5fcb16cec..2860b3eefd6 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="period_id"/>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 22280c6f9e4..452c80f1049 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+                    <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                    or                    
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <group>
                     <separator string="Unreconciliate Transactions"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 1366bc9a6a2..06bc5d6e9c5 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
 	                <header>
-	                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object" class="oe_highlight_on_dirty"  />
+	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
@@ -39,7 +41,9 @@
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight_on_dirty"  />
+                        <button string="Ok" name="create_entries" type="object" default_focus='1' 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 entries?"/>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 6db87d263c2..f63d6ef5b4f 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
 	            <form string="Post Journal Entries" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_highlight_on_dirty"  />
+	                    <button string="Approve" name="validate_move" type="object" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <separator string="Post Journal Entries of a Journal"/>
 	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
@@ -47,7 +49,9 @@
             <field name="arch" type="xml">
 	            <form string="Post Journal Entries" version="7.0">
 	                <header>
-	                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+	                    <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
 	                </header>
 	                <group>
 	                    <separator string="Post Journal Entries"/>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 7b6b2889acc..b1242d59d4e 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
                 <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 71d5f17fbce..3bc1820665d 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" 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">
                     <field name="date1"/>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index e313747f290..c99b7ad4490 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
                 <header>
-                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight_on_dirty"  />
+                    <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <group>
                     <label string="Save This Distribution as a Model"/>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 6608d7cbff3..cf0a76da9c0 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
                     <header>
-                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_highlight_on_dirty"  />
+                        <button name="modify" string="Modify" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 1fde17c3a5e..92eedbcc6b9 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index 3abda334f0f..d44992228c9 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -11,7 +11,9 @@
       <field name="arch" type="xml">
         <form string="Confirm selected statement lines" version="7.0">
             <header>
-                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight_on_dirty"  />
+                <button string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight_on_dirty"/>
+                or
+                <button string="Cancel" class="oe_link" special="cancel"/>
             </header>
             <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
             <label string="Confirmed lines cannot be changed anymore."/>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index e1dfd3525b1..efe90e769ca 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
                      </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 8aa1f1fae45..83920df20fb 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
                      </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 64d2593d840..36486fc91a2 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
                      </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index 10c7de0a75d..11556163ecd 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -9,7 +9,9 @@
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
               <header>
-                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight_on_dirty"  />
+                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                  or
+                  <button string="Cancel" class="oe_link" special="cancel"/>
               </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 6640c824ba4..f9532d163d6 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -10,7 +10,9 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
             <header>
-                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                <button name="coda_parsing" string="_Import" type="object" class="oe_highlight_on_dirty"/>
+                or
+                <button string="Cancel" class="oe_link" special="cancel"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>
@@ -28,8 +30,10 @@
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
           <header>
-              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight_on_dirty"  />
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" class="oe_highlight_on_dirty"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" class="oe_highlight_on_dirty"/>
+              or
+              <button string="Cancel" class="oe_link" special="cancel"/>
           </header>
           <group string="Results :">
               <field name="note" nolabel="1" colspan="2"/>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index f3eba9eb07f..25b8876d5fb 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                    <button name="do_continue" string="Continue" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <separator string="Send Follow-Ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
@@ -76,8 +78,10 @@
             <field name="arch" type="xml">
             <form string="Send followups" version="7.0">
                 <header>
-                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index 33a502e8b7f..df6ada21a94 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Select Message" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight_on_dirty"  />
+                        <button name="check_report" string="Print" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="message"/>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 313582ffe19..879b6d7b3b9 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
                 <header>
-                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
+                    <button name="search_entries" string="Search" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <group>
                     <field name="duedate" />
@@ -25,7 +27,9 @@
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
                     <header>
-                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight_on_dirty"  />
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <separator string="Entries"/>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 3d3608716ed..e76291abbf1 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
                     <header>
-                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight_on_dirty"  />
+                        <button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <separator string="Are you sure you want to make payment?"/>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index f3510b9d716..be80d50aae9 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -9,7 +9,9 @@
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
                     <header>
-                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="lines"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1c940eedae6..9bef1f20c4f 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
                     <header>
-                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Go" name="search_invoices" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" >
                         <field name="date"/>
@@ -35,7 +37,9 @@
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Ok" name="populate_statement" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 7652d5764cf..79feed68b8b 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
                 <separator string="Unreconciliation Transactions" />
                 <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index 2038e8be4bd..e10ae70d437 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
                     <header>
-                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group col="4">
                          <field name="from"/>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 763c55edfdc..be3b3c7138e 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
                     <header>
-                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index ee71bfcc838..58510ff4d8f 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
                     <header>
-                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Relationship Graphs" colspan="6"/>
                 </form>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 0d04733f96a..31026141322 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <field name="check_date"/>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index be02a1a1d24..86b1c63c9c8 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group> 
                         <field name="check_date"/>
@@ -86,7 +88,9 @@
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <header>
-                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button string="Continue" name="inter_call" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="Module Information" colspan="4"/>
                     <field name="name"/>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 1c01292a796..6fc6f8a35b2 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <header>
-                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="record_save" string="Continue" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group>
                         <separator string="Recording Information" colspan="4"/>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 53f12399238..44339ded438 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -8,11 +8,15 @@
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
                 <header>
-                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
-                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                    <button name="get_report" string="Continue" type="object" class="oe_highlight_on_dirty"/>
+                    <button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight_on_dirty"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
-                <separator string="Select your report" colspan="4"/>
-                <field name="report_id"/>
+                <group>
+                    <separator string="Select your report" colspan="4"/>
+                    <field name="report_id"/>
+                </group>
             </form>
             </field>
        </record>
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 54bd1b3e784..f1581db1b29 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -11,7 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
                     <header>
-                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_highlight_on_dirty"  />
+                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 8564e3434af..74df2784a61 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -25,7 +25,9 @@
             <field name="arch" type="xml">
                <form string="Caldav's host name configuration" version="7.0">
                     <header>
-                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="next_window" string="Next" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                 	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
                     <newline/>
@@ -44,7 +46,9 @@
             <field name="arch" type="xml">
                 <form string="User Preference" version="7.0">
                     <header>
-                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"  />
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <separator string="" colspan="4"/>
                     <field name="service"  colspan="4" width="250" readonly="1"/>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 567b0d4ba2d..a5cc8383db3 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
                     <header>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index cc098bce4fa..376c26b4e71 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
                     <header>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>