diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index e2d67e7fb55..73c9652f8fa 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -9,7 +9,6 @@
                 <form position="attributes" version="7.0">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
-                <button name="action_skip" position="replace"/>
                 <button name="action_next" position="attributes">
                     <attribute name="string">Continue</attribute>
                 </button>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 122f4a77fd8..b897ab31843 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1983,8 +1983,7 @@
             <field name="arch" type="xml">
                 <form string="Create Account" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"/>
                     </header>
                     <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
                     <field name="cparent_id"/>
@@ -2355,7 +2354,6 @@
                 <form position="attributes" version="7.0">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
-                <button name="action_skip" position="replace"/>
                 <group string="res_config_contents" position="replace">
                     <field name="only_one_chart_template" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
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 59c4095bb22..f12999e3031 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                    <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </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 8e2351b63e9..8f497003c57 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </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 a9c868a6ac8..1637398af90 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,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select period" version="7.0">
                     <header>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </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 29948e7b5c0..cd730ce628c 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
-                     <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </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 5020a1859a6..73c66103b74 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </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 d6c36aae990..e623e79d2d1 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </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 08ef0e8e9b6..f6b4c3aabdb 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 45311de22cc..0d602e596ee 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -17,8 +17,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="has_default_company" invisible="1" />
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b8e719acc35..008c454bb92 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -9,8 +9,7 @@
              <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"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight"/>
                     </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."/>
@@ -53,9 +52,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation Result" version="7.0">
-                    <header>
-                        <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
-                    </header>
                     <group>
                         <field name="reconciled"/>
                         <field name="unreconciled"/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 3d942ef0097..752c5bed915 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -8,8 +8,7 @@
             <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"/>
-                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize" class="oe_highlight"/>
                     </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 1ae294c3c0a..a09c49257f8 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -8,8 +8,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
                     </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e141b4fc911..0e6243327ac 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -7,15 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
-                <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-                </header>
-                <separator string="Close states of Fiscal year and periods"/>
-                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
-                <group>
-                    <field name="fy_id"  domain="[('state','=','draft')]"/>
-                </group>
+	                <header>
+	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight"/>
+	                </header>
+	                <separator string="Close states of Fiscal year and periods"/>
+	                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
+	                <group>
+	                    <field name="fy_id"  domain="[('state','=','draft')]"/>
+	                </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index aa34fefd128..6538ed3ff0d 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -8,8 +8,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object" class="oe_highlight"/>
                     </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 aec13d4ca72..c393c2f0202 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object" class="oe_highlight"/>
                     </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 d95889a6558..2a4fd3bb5d6 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,13 +6,14 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Confirm Draft Invoices" version="7.0">
-                <separator string="Confirm Draft Invoices" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
-                   </group>
-            </form>
+	            <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"/>
+	                </header>
+	                <group>
+	                    <separator string="Confirm Draft Invoices" colspan="4"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
@@ -27,13 +28,14 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Cancel Selected Invoices" version="7.0">
-                <separator string="Cancel Selected Invoices" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
-                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
-                   </group>
-            </form>
+	            <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"/>
+	                </header>
+	                <group>
+	                    <separator string="Cancel Selected Invoices" colspan="4"/>
+	                </group>    
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 036cd3b2f8a..c30b494d840 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,13 +7,14 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                </header>
-                <label string="Are you sure you want to open Journal Entries?"/>
-            </form>
+	            <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"/>
+	                </header>
+	                <group>
+	                    <label string="Are you sure you want to open Journal Entries?"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index d5d83699666..62e12534fe5 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -8,8 +8,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </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 8c7a62a2281..fdf27e8cefd 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -103,13 +103,11 @@ class account_move_journal(osv.osv_memory):
                 period_string = _("Period: %s") % tools.ustr(period)
     
             separator_string = _("Open Journal Items !")
-            cancel_string = _("Cancel")
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
-            <form string="Standard entries">
+            <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="%s"/>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
                 </header>
                 <group string="%s" colspan="4">
                     <field name="target_move" />
@@ -119,7 +117,7 @@ class account_move_journal(osv.osv_memory):
                     <newline/>
                     <label width="300" string="%s"/>
                 </group>
-            </form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
+            </form>""" % (open_string, separator_string, journal_string, period_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
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 559c021a0ff..aa6da30ea75 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -8,8 +8,7 @@
             <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" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </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 6ce685431fe..c2ffa48f27c 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -9,10 +9,11 @@
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
-                    <label string="Are you sure you want to open Account move line entries!"/>
+                    <group>
+                        <label string="Are you sure you want to open Account move line entries!"/>
+                    </group>    
                </form>
             </field>
         </record>
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 9123e7b826e..1d1c0c6738c 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -8,8 +8,7 @@
             <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" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
                     </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 a4e338f3b9e..c1308a2c971 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object" class="oe_highlight"/>
                     </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 6bf54e07945..dc5a01f7700 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object" class="oe_highlight"/>
                     </header>
                     <separator string="Are you sure?" colspan="4"/>
                     <group>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 2648c3439bf..7fd3def218f 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
                     <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="next_partner_id"/>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 959c4ceddcf..dc13ae1caaf 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -9,10 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
-                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+                        <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"/>
+                        <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
                     </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
@@ -51,8 +50,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
                     </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 d6cde8599e0..02064472160 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -10,8 +10,7 @@
             <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"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight"/>
                     </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 425f5d3bbbc..c8bf4c935a1 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -9,8 +9,7 @@
             <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" />
-                    <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" class="oe_highlight"/>
                 </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 5ea33021926..6035c30afc8 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -9,11 +9,12 @@
             <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"/>
-                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight"/>
                     </header>
-                    <label string="Are you sure you want to open this invoice ?"/>
-                    <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <group>
+                        <label string="Are you sure you want to open this invoice ?"/>
+                        <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..4940dd7b448 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,9 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-execute" string="Generate Entries"
-                            name="action_generate" type="object" />
+                        <button icon="gtk-execute" string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
                     </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 309af53ca17..2bae500bb56 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -9,8 +9,7 @@
             <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" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
                     </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 0d9bb1a466f..023066d1a74 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -9,11 +9,12 @@
             <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                 </header>
-                <separator string="Unreconciliate 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 disabled"/>
+                <group>
+                    <separator string="Unreconciliate 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 disabled"/>
+                </group>    
             </form>
             </field>
         </record>
@@ -43,11 +44,12 @@
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
                 </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"/>
+                <group>
+                    <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"/>
+                </group>    
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 682236a0610..14a3c42f64f 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -7,17 +7,16 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                </header>
-                <separator string="This wizard will create recurring accounting entries"/>
-                <label string="Create manual recurring entries in a chosen journal."/>
-                <group>
-                    <field name="model"/>
-                </group>
-            </form>
+	            <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"/>
+	                </header>
+	                <separator string="This wizard will create recurring accounting entries"/>
+	                <label string="Create manual recurring entries in a chosen journal."/>
+	                <group>
+	                    <field name="model"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
@@ -40,10 +39,11 @@
             <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'/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                     </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    <group>
+                        <label string = "Are you sure you want to create entries?"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 2ee826fe1f7..714aa67a8a1 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,18 +8,17 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="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."/>
-                <group>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
-                </group>
-               </form>
+	            <form string="Post Journal Entries" version="7.0">
+	                <header>
+	                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object" class="oe_highlight"/>
+	                </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."/>
+	                <group>
+	                    <field name="journal_id"/>
+	                    <field name="period_id"/>
+	                </group>
+	            </form>
             </field>
         </record>
 
@@ -46,14 +45,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries" version="7.0">
-                <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
-                </header>
-                <separator string="Post Journal Entries"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
-            </form>
+	            <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"/>
+	                </header>
+	                <group>
+	                    <separator string="Post Journal Entries"/>
+	                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
+	                </group>    
+	            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index a54da1aaad6..ba13b17bb46 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button icon='gtk-cancel' special="cancel"  string="Cancel" />
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </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 4138fe79582..8b4d290c76b 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                 </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 fd7c03e058e..6fff5bf2b1d 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,10 +8,11 @@
             <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"/>
-                    <button special="cancel" string="Cancel" icon='gtk-ok' />
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight"/>
                 </header>
-                <label string="Save This Distribution as a Model"/>
+                <group>
+                    <label string="Save This Distribution as a Model"/>
+                </group>
             </form>
             </field>
         </record>
@@ -22,9 +23,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
-                    <button special="cancel" string="Ok" icon='gtk-ok'/>
-                </header>
                 <label string="This distribution model has been saved.You will be able to reuse it later."/>
             </form>
             </field>
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 a68d28ac653..e23c9d85079 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
                     <header>
-                        <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test" class="oe_highlight"/>
                     </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 5d2bc39a751..b3114dde5fa 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
                     <header>
-                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
                     </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 0171c265395..5d73127e45a 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,8 +11,7 @@
       <field name="arch" type="xml">
         <form string="Confirm selected statement lines" version="7.0">
             <header>
-                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight"/>
             </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 a3ca1d8c1b6..4653ba8e686 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -9,8 +9,7 @@
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <header>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </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 f572109b1fd..65e7d82d86e 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -9,8 +9,7 @@
              <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"/>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </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 ab4f75c2729..f442a34be9a 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,8 +9,7 @@
              <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"/>
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
                      </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 aba258663b7..da32ef5dae3 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -9,8 +9,7 @@
         <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"/>
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                  <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1" class="oe_highlight"/>
               </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 91ba355ba65..84714ab5c71 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -10,8 +10,7 @@
       <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"/>
-                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok" class="oe_highlight"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>
@@ -29,9 +28,8 @@
       <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"/>
-              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
-              <button special="cancel" string="Close" icon="gtk-cancel"/>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply" class="oe_highlight"/>
           </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 32b6383a8cc..3509956512f 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </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."/>
@@ -77,9 +76,8 @@
             <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"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
@@ -116,9 +114,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Summary" version="7.0">
-                <header>
-                    <button special="cancel" string="Ok" icon='gtk-cancel'/>
-                </header>
                 <separator string="Summary"/>
                 <field name="summary"/>
             </form>
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 1ddef75e05b..2c000bcdca0 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Select Message" version="7.0">
                     <header>
-                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                     </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 9e4bf416f5e..a4e49149c16 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
                 </header>
                 <group>
                     <field name="duedate" />
@@ -26,11 +25,12 @@
             <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"/>
-                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
                     </header>
-                    <separator string="Entries"/>
-                    <field name="entries"/>
+                    <group>
+                        <separator string="Entries"/>
+                        <field name="entries"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ef95d419427..032790b401e 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -9,10 +9,11 @@
              <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"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight"/>
                     </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    <group>
+                        <separator string="Are you sure you want to make payment?"/>
+                    </group>    
                 </form>
             </field>
         </record>
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 afcaf82be3a..f99059c8166 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -9,10 +9,11 @@
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
                     <header>
-                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <field name="lines"/>
+                    <group>
+                        <field name="lines"/>
+                    </group>
                 </form>
              </field>
         </record>
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 1c0c00bd662..2674e8f336d 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -6,17 +6,15 @@
             <field name="model">account.statement.from.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Invoices in Statement">
+                <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"/>
+                    </header>
                     <group colspan="4" >
                         <field name="date"/>
                         <newline/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -35,16 +33,14 @@
             <field name="model">account.statement.from.invoice.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Entries">
+                <form string="Import Entries" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
+                    </header>
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
                         <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 38600a385ab..e1fd6cfb07a 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                 <header>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </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 aa141e34537..232b15d6c72 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
                     </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 985bab8bf6b..dd61e54d09a 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -9,7 +9,10 @@
             <field name="model">base_calendar.invite.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invite People">
+                <form string="Invite People" version="7.0">
+                    <header>
+                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -31,10 +34,6 @@
                             </group>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
-                    </group>
                 </form>
             </field>
         </record>
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 4712ac2caa4..02937df25bc 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
@@ -7,10 +7,11 @@
             <field name="model">create.relation.graph</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Generate Relationship Graph">
+                <form string="Generate Relationship Graph" version="7.0">
+                    <header>
+                        <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
                     <separator string="Relationship Graphs" colspan="6"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok"/>
                 </form>
             </field>
         </record>
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 94e20d98f8b..100de20ca28 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
@@ -7,17 +7,17 @@
             <field name="model">base.module.data</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Data Recording">
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                <form string="Data Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <field name="check_date"/>
+                        <newline/>
+                        <field name="filter_cond"/>
+                        <separator string="Choose objects to record" colspan="4"/>
+                        <field name="objects" colspan="4" nolabel="1"/>
+                        <group><field name="info_yaml"/></group>
                     </group>
                 </form>
             </field>
@@ -57,11 +57,6 @@
                 <form string="Data Recording">
                     <separator string="Result, paste this to your module's xml" colspan="4" />
                     <field name="res_text" nolabel="1"  colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>
                 </form>
             </field>
          </record>
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 60aeba46ef2..9fc5d3f62b5 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
@@ -7,18 +7,18 @@
             <field name="model">base.module.record</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Objects Recording">
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
-                    </group>
+                <form string="Objects Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
+                    </header>
+                    <group> 
+                        <field name="check_date"/>
+                        <newline/>
+                        <field name="filter_cond"/>
+                        <separator string="Choose objects to record" colspan="4"/>
+                        <field name="objects" colspan="4" nolabel="1"/>
+                        <group><field name="info_yaml"/></group>
+                   </group>
                 </form>
             </field>
         </record>
@@ -66,11 +66,6 @@
                     <separator string="Information" colspan="4"/>
                     <label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
                     <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>
                 </form>
             </field>
          </record>         
@@ -89,7 +84,10 @@
             <field name="model">base.module.record.objects</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Module Recording">
+                <form string="Module Recording" version="7.0">
+                    <header>
+                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
                     <separator string="Module Information" colspan="4"/>
                     <field name="name"/>
                     <field name="directory_name"/>
@@ -100,11 +98,6 @@
                     <field name="data_kind"/>
                     <newline/>
                     <field name="description" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok"/>
-                    </group>
                 </form>
             </field>
          </record>
@@ -116,11 +109,6 @@
             <field name="arch" type="xml">
                 <form string="Module Recording">
                     <label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-ok" string="OK" special="cancel"/>
-                    </group>
                 </form>
             </field>
         </record>         
@@ -134,11 +122,6 @@
                     <separator string="YAML file successfully created !" colspan="4"/>
                     <newline/>
                     <field name="yaml_file" filename="module_filename"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>				    
                 </form>  
             </field>
         </record>   
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 86b64220543..6c4e7deb9f0 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -7,16 +7,16 @@
             <field name="model">base.module.save</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Module Recording">
-                    <separator string="Recording Information" colspan="4"/>
-                    <field name="info_status"/>
-                    <field name="info_text" colspan="4" nolabel="1"/>
-                    <field name="info_yaml" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_save" icon="gtk-ok" string="Continue" type="object"/>
-                    </group>
+                <form string="Module Recording" version="7.0">
+                    <header>
+                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator string="Recording Information" colspan="4"/>
+                        <field name="info_status"/>
+                        <field name="info_text" colspan="4" nolabel="1"/>
+                        <field name="info_yaml" colspan="4"/>
+                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index cde9b55f991..c7f705b277d 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -8,19 +8,18 @@
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
                 <data>
-                    <form position="attributes">
+                    <form position="attributes" version="7.0">
+                        <header>
+                            <xpath expr="//button[@string='Install Modules']" position="replace">
+                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_highlight"/>
+                            </xpath>
+                        </header>
                         <attribute name="string">OpenERP Report Designer Configuration</attribute>
                     </form>
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
                     </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
-                    </xpath>
+                    
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
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 7467e55a9f4..14f18949ffb 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-     
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Get a report">
+            <form string="Get a report" version="7.0">
+                <header>
+                    <button name="get_report" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                </header>
                 <separator string="Select your report" colspan="4"/>
                 <field name="report_id"/>
-                 <separator string="" colspan="4"/>
-                   <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                   <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
             </form>
             </field>
        </record>
@@ -41,10 +40,6 @@
             <field name="file_sxw_upload"/>
             <newline/>
             <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
-              <separator string="" colspan="4"/>
-              <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-              <button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward"/>
-
             </form>
             </field>
        </record>
@@ -53,13 +48,10 @@
             <field name="model">base.report.rml.save</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Save RML FIle">
-                <separator string="The RML Report" colspan="4"/>
-                <field name="file_rml"/>
-                <newline/>
-                 <separator string="" colspan="4"/>
-               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            </form>
+                <form string="Save RML FIle">
+                    <separator string="The RML Report" colspan="4"/>
+                    <field name="file_rml"/>
+                </form>
             </field>
        </record>
 
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e4b9b9dadb2..0e83fbf9e2b 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -50,8 +50,7 @@
         <field name="arch" type="xml">
             <form string="Configure Sales" version="7.0">
                 <header>
-                    <button string="Apply" type="object" name="execute"/>
-                    <button string="Cancel" special="cancel"/>
+                    <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                 </header>
                 <group>
                     <group name="config_sale" colspan="4"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 0b85e13a08f..1c81907fd0f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group>
                         <group string="Company Settings">
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index af71fa5a2eb..38848e0f141 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -11,8 +11,7 @@
             <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" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
                     </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 9d088ae55f6..4393e2d8657 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -13,11 +13,6 @@
                         <field name="url" colspan="4" />
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
-                        <separator colspan="4"/>
-                        <group col="4" colspan="4">
-                            <label string="" colspan="2"/>
-                            <button special="cancel" string="_Close" icon="gtk-close"/>
-                        </group>
                     </group>
                 </form>
             </field>
@@ -28,18 +23,16 @@
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Caldav's host name configuration">
+               <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"/>
+                    </header>
                 	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
                     <newline/>
                     <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
                     <newline/>
                     <separator colspan="4"/>
                     <field name="host_name"  colspan="4" width="250" />
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                       <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
-                    </group>
                </form>
             </field>
         </record>
@@ -49,19 +42,15 @@
             <field name="model">user.preference</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="User Preference">
+                <form string="User Preference" version="7.0">
+                    <header>
+                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
                     <separator string="" colspan="4"/>
                     <field name="service"  colspan="4" width="250" readonly="1"/>
                     <field name="collection"  colspan="4" width="250" invisible="1" />
                     <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
                     <field name="device"  colspan="4" width="250" />
-                    <separator colspan="4"/>
-                    
-                    <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                        <button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 8b74e29a98e..92e4504db02 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -11,11 +11,6 @@
                          <field name="name"/>
                          <field name="file_path" colspan="4" width="300"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string=""/>
-                        <button  icon="gtk-close" special="cancel" string="_Close"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index bda2c122e65..ccda19944a9 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -6,16 +6,14 @@
             <field name="model">calendar.event.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import ICS">
+                <form string="Import ICS" version="7.0">
+                    <header>
+                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,10 +27,6 @@
                     <group colspan="4" >
                           <field name="msg" colspan="4" width="300" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4">
-                        <button  icon="gtk-ok" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -42,6 +36,5 @@
             res_model="calendar.event.import" src_model="basic.calendar"
             view_id="view_calendar_event_import"
             view_mode="form" target="new" view_type="form" />
-        
     </data>
 </openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 244e471df0e..0d427824e26 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -6,16 +6,14 @@
             <field name="model">calendar.event.subscribe</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscribe to Remote Calendar">
+                <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"/>
+                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,10 +27,6 @@
                     <group colspan="4" >
                           <field name="msg" colspan="4" width="300" nolabel="1"/>
                     </group>
-                        <separator string="" colspan="4" />
-                    <group colspan="4">
-                        <button  icon="gtk-ok" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index c2a7b248d93..591103aa7b7 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -11,11 +11,12 @@
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
                     <header>
-                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <separator string="Add Note"/>
-                    <field name="body"/>
+                    <group>
+                        <separator string="Add Note"/>
+                        <field name="body"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index aff5ed7f8c6..c92f92d686f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,37 +1,31 @@
 <openerp>
       <data>
-
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
           <field name="name">crm.lead2opportunity.partner.form</field>
           <field name="model">crm.lead2opportunity.partner</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-               <form string="Convert to Opportunity">
-                   
-                        <field name="action"/>
-                        <group attrs="{'invisible':[('action','!=','exist')]}">
-                            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-                        </group>
-                        <separator string="Convert to Opportunity" colspan="4"/>
-                        <field name="name" colspan="4"/>
-                        <group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
-                            <separator string="Select Opportunities" colspan="4" />
-                        </group>
-                            <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
-                                <tree>
-                                    <field name="name" />
-                                    <field name="partner_id" />
-                                    <field name="user_id" />
-                                    <field name="section_id" />
-                                </tree>
-                            </field>
-                        
-                        <separator string="" colspan="4" />
-                        <group col="4" colspan="4">
-                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                            <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
-                        </group>
-                  
+               <form string="Convert to Opportunity" version="7.0">
+                    <header>
+                        <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
+                    <field name="action"/>
+                    <group attrs="{'invisible':[('action','!=','exist')]}">
+                        <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                    </group>
+                    <separator string="Convert to Opportunity" colspan="4"/>
+                    <field name="name" colspan="4"/>
+                    <group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
+                        <separator string="Select Opportunities" colspan="4" />
+                    </group>
+                        <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
+                            <tree>
+                                <field name="name" />
+                                <field name="partner_id" />
+                                <field name="user_id" />
+                                <field name="section_id" />
+                            </tree>
+                    </field>
               </form>
           </field>
        </record> 
@@ -41,27 +35,22 @@
 	          <field name="model">crm.lead2opportunity.partner.mass</field>
 	          <field name="type">form</field>
 	          <field name="arch" type="xml">
-	               <form string="Convert to Opportunity">
-	                   
-	                        <field name="action"/>
-	                        <field name="name" colspan="4"/>
-	                        
-	                        <separator string="Assigned Opportunities to" colspan="4" />
-							<field name="section_id" />
-							<group col="4" colspan="4">
-								<separator string="Select Salesman" colspan="4" />
-							</group>
-							<field name="user_ids" nolabel="1" colspan="4">
-								<tree>
-									<field name="name" />
-								</tree>
-							</field>
-	                        <separator string="" colspan="4" />
-	                        <group col="4" colspan="4">
-	                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	                            <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok"/>
-	                        </group>
-	                  
+	               <form string="Convert to Opportunity" version="7.0">
+	                    <header>
+	                        <button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok" class="oe_highlight"/>
+	                    </header>
+                        <field name="action"/>
+                        <field name="name" colspan="4"/>
+                        <separator string="Assigned Opportunities to" colspan="4" />
+						<field name="section_id" />
+						<group col="4" colspan="4">
+							<separator string="Select Salesman" colspan="4" />
+						</group>
+						<field name="user_ids" nolabel="1" colspan="4">
+							<tree>
+								<field name="name" />
+							</tree>
+						</field>
 	              </form>
 	          </field>
 	       </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index e067f43e955..14f1ab44c30 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -10,11 +10,10 @@
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
                   <header>
-                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
-                  <separator string="Create a Partner"/>
                   <group col="4">
+                      <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 7e3f7b2b0f4..29b11b1ee25 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
                     <header>
-                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" />
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <separator string="Select Opportunities"/>
+                    <group>
+                        <separator string="Select Opportunities"/>
+                    </group>
                     <field name="opportunity_ids">
                         <tree>
                             <field name="name" />
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index ad1a763fa46..a5dd9c69d13 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -11,9 +11,8 @@
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
                     <header>
-                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index c7641d8f64d..2cc8825078f 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -10,8 +10,7 @@
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
                   <header>
-                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
                   <group col="4">
                       <field name="name"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 6415fddd2ab..a115a2d8f5e 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -10,12 +10,10 @@
             <field name="model">crm.phonecall2meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Convert To Meeting">
+                <form string="Convert To Meeting" version="7.0">
                     <header>
-                        <button name="action_cancel" string="_Cancel"
-                            icon="gtk-cancel" special="cancel" />
                         <button name="action_make_meeting" type="object"
-                            string="_Schedule" icon="gtk-go-forward" />
+                            string="_Schedule" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
                 </form>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 5f12181c48f..0bedfc34dc8 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
                     <header>
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="name"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index c1ba57a7a24..f8ac04e16ac 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -10,11 +10,12 @@
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
                 <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager" class="oe_highlight"/>
                 </header>
-                <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
-                <label string="You may have to verify that this partner does not exist already."/>
+                <group>
+                    <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+                    <label string="You may have to verify that this partner does not exist already."/>
+                </group>
             </form>
         </field>
        </record>
@@ -28,8 +29,7 @@
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
                 <header>
-                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <group>
                     <field name="action"/>
@@ -49,7 +49,5 @@
             <field name="view_id" ref="view_crm_phonecall2partner_create"/>
             <field name="target">new</field>
         </record>
-        
-
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index b1f40c4eebd..0dce7a02003 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -11,9 +11,8 @@
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
                     <header>
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Schedule/Log a Call" colspan="4"/>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 7f20d5b4b15..de078c48825 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -8,7 +8,10 @@
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Send Mail">
+                <form string="Send Mail" version="7.0">
+                    <header>
+                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                    </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -41,11 +44,6 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <label string="" colspan="1"/>
-                        <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 6c70f30c036..f9193e18c9d 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
                     <header>
-                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
-                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="questionnaire_id"/>
@@ -34,14 +33,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
+                    <header>
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object" class="oe_highlight"/>
+                    </header>
                     <separator colspan="4" string="Questionnaire"/>
                     <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 8ed31ee2323..2bbdb02291b 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Browse Document"/>
                     <group>
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index cf233b20682..efe0074b313 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,18 +9,17 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//label[@name='placeholder']" position="before">
+                    <xpath expr="//form/header/button" position="before">
+						<field name="use_template" invisible="1"/>
+						<button icon="gtk-paste" type="object" name="template_toggle"
+						        string="" help="Use a message template" />
+						<button icon="gtk-save" type="object" name="save_as_template"
+						        string="" help="Save as a new template"/>
+                    </xpath>
+                    <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="template_id" colspan="3"
                                    on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
-                            <label string="" name="flexspace" colspan="1"/>
-                        </group>
-                        <group colspan="1" col="6">
-                            <field name="use_template" invisible="1"/>
-                            <button icon="gtk-paste" type="object" name="template_toggle"
-                                    string="" help="Use a message template" colspan="1"/>
-                            <button icon="gtk-save" type="object" name="save_as_template"
-                                    string="" help="Save as a new template" colspan="1"/>
                         </group>
                     </xpath>
                 </data>
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 4aab57396ad..3fd3c9e2324 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -28,11 +28,6 @@
                         </notebook>
                     </group>
                     <field name="report_name" colspan="4" readonly="1"/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <label string=""/>
-                        <button icon="gtk-ok" special="cancel" string="Close" colspan="1"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index b79cae03723..e6257009353 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -9,10 +9,11 @@
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
                   <header>
-                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
-                      <button  icon="gtk-close" special="cancel" string="Close"/>
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                   </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <group>
+                    <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </group>
             </form>
             </field>
         </record>
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 5f96c8a616e..3a4e46809b4 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -6,7 +6,11 @@
             <field name="model">event.moodle.config.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Moodle">
+                <form string="Configure Moodle" version="7.0">
+                    <header>
+                        <button type="object" name="configure_moodle"
+                            string="Configure Moodle" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
                     <group>
                      <separator string="Server" colspan="4"/>
                      <field name="server_moodle"/>
@@ -20,11 +24,6 @@
                      <field name="moodle_username"/>
                      <field name="moodle_password"/>
                     </group>
-                    <newline/>
-                    <button type="special" special="cancel"
-                            string="Cancel" icon="gtk-cancel"/>
-                    <button type="object" name="configure_moodle"
-                            string="Configure Moodle" icon="gtk-ok"/>
                 </form>
             </field>
         </record>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index 0678f120f06..3c8fce29870 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
                    <header>
-                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
-                       <button  icon="gtk-close" special="cancel" string="Close"/>
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
                    </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index 0e19a14d221..67d071d23b6 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
                     <header>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                        <button name="login" string="_Login" type="object" icon="terp-check"/>
+                        <button name="login" string="_Login" type="object" icon="terp-check" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index d78e3a4e5d1..9c9fd628a6b 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -16,8 +16,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Additional Features" colspan="4"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index a5015fe4fe5..73b96b0654a 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
                 </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 63cd0978a7f..9ccad725434 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -6,13 +6,14 @@
             <field name="model">hr.attendance.week</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Weekly">
-                <field name="init_date"/>
-                <field name="end_date"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+            <form string="Print Attendance Report Weekly" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
+                </header>
+                <group>
+                    <field name="init_date"/>
+                    <field name="end_date"/>
+                </group>    
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index a9557fa2962..6aa0144a351 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,8 +9,7 @@
             <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" colspan="2"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
                 </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 13ce91c79d4..c5050b499bd 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
@@ -6,20 +6,20 @@
             <field name="model">hr.sign.in.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
-                    <separator colspan="4" string="Sign in / Sign out"/>
-                    <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
-                    <newline/>
+                <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"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator colspan="4" string="Sign in / Sign out"/>
+                        <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
+                        <newline/>
+                    </group>
                     <group colspan="4" >
                     <field name="name" />
                     <field name="state" />
                     </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,11 +29,8 @@
             <field name="model">hr.sign.in.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
+                <form string="Sign in / Sign out" version="7.0">
                     <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -56,17 +53,15 @@
             <field name="model">hr.sign.in.out.ask</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="hr.sign.out.ask">
+                <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"/>
+                    </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" />
                     <field name="name" />
                     <field name="last_time" string="Your last sign out" />
                     </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -76,17 +71,15 @@
             <field name="model">hr.sign.in.out.ask</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="hr.sign.in.out.ask">
+                <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"/>
+                    </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" />
                     <field name="name" />
                     <field name="last_time" string="Your last sign in" />
                     </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 2b16e494c74..137138f6b54 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -9,8 +9,7 @@
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
                 <header>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </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 72844a58ccb..f5505267340 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="gtk-print" name="print_report" string="Print" type="object" class="oe_highlight"/>
                 </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 1f330580c6e..c773150a995 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -7,7 +7,10 @@
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leaves Summary">
+                <form string="Leaves Summary" version="7.0">
+                    <header>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
+                    </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -15,11 +18,6 @@
                         <newline/>
                         <field name="emp" invisible="True"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index e48a8f6470c..ee76c425ab9 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -7,17 +7,15 @@
             <field name="model">payslip.lines.contribution.register</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Contribution Register's Payslip Lines">
+            <form string="Contribution Register's Payslip Lines" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
+                </header>
                 <group col="4" colspan="6">
                     <field name="date_from"/>
                     <newline/>
                     <field name="date_to"/>
                 </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 60b25bbd95a..048780b6a5c 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -7,19 +7,18 @@
             <field name="model">hr.payslip.employees</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslips by Employees">
-                    <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+                <form string="Payslips by Employees" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+                    </group>
                     <group colspan="4" >
                         <separator string="Employees" colspan="4"/>
                         <newline/>
                         <field name="employee_ids" nolabel="1"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button  icon="gtk-execute" string="Generate" name="compute_sheet" type="object"/>
-                    </group>
                </form>
             </field>
         </record>
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 15bede42e96..597758db1b0 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
@@ -7,14 +7,12 @@
             <field name="model">hr.recruitment.partner.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Convert To Partner">
+			<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"/>
+			    </header>
 			    <group col="4" colspan="6">
-			            <label string="Are you sure you want to create a contact based on this job request ?"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
+			        <label string="Are you sure you want to create a contact based on this job request ?"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index 7a66d070291..0e760a3a511 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -7,13 +7,14 @@
             <field name="model">hired.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create New Employee">
-                    <label string="Would you like to create an employee ?" colspan="4" />
-                    <separator string="" colspan="4"/>
-                    <newline />
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+            <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"/>
                     <button name="case_close" string="No" icon='gtk-no' type="object"/>
-                    <button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test"/>
+                </header>
+                <group>
+                    <label string="Would you like to create an employee ?" colspan="4" />
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index 10329c6a856..c40169e77ed 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -7,7 +7,10 @@
             <field name="model">hr.recruitment.job2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Schedule Phone Call">
+			<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"/>
+			    </header>
 			    <group col="4" colspan="6">
                     <separator string="Phone Call Description" colspan="4" />
                     <newline />
@@ -18,11 +21,6 @@
                     <newline />
                     <field name='category_id' domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="make_phonecall" string="Schedule Phone Call" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
 			</form>
             </field>
         </record>
@@ -37,4 +35,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
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 1eda6de05cb..197060d092a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,17 +8,15 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employee Timesheet">
+				<form string="Monthly Employee Timesheet" version="7.0">
+				    <header>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
+				    </header>
 					<group colspan="4">
 						<field name="month"/>
 						<field name="year"/>
 						<field name="employee_id" colspan="3"/>
 					</group>
-					<separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
                 </form>
 			</field>
 		</record>
@@ -44,17 +42,15 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Print My Timesheet">
+                <form string="Print My Timesheet" version="7.0">
+                    <header>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
+                    </header>
                     <group colspan="4">
                     <separator string="This wizard will print monthly timesheet" colspan="4"/>
                         <field name="month"/>
                         <field name="year"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
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 95b7bd3b93e..6d6f8f93e7f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,7 +8,10 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employees Timesheet">
+				<form string="Monthly Employees Timesheet" version="7.0">
+				    <header>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_highlight"/>
+				    </header>
 					<group height="260" width="460">
 						<group colspan="4">
 							<field name="month"/>
@@ -16,11 +19,6 @@
                             <separator string="Employees" colspan="4"/>
 							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
-						<separator colspan="4"/>
-						<group colspan="4">
-							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
-						</group>
 					</group>
 				</form>
             </field>
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 7e8d7eea549..48e608991a8 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
@@ -6,14 +6,14 @@
             <field name="model">hr.sign.in.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
-                    <separator colspan="4" string="Sign In/Out by Project"/>
-                    <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
-                    <newline/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object"/>
-                   </group>
+                <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"/>
+                    </header>
+                    <group>
+                        <separator colspan="4" string="Sign In/Out by Project"/>
+                        <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
+                    </group>
                </form>
             </field>
         </record>
@@ -23,7 +23,10 @@
             <field name="model">hr.sign.in.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
+                <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"/>
+                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -33,10 +36,6 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -56,7 +55,11 @@
             <field name="model">hr.sign.out.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
+                <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"/>
+                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -70,12 +73,7 @@
                         <label string="(Keep empty for current_time)" colspan="2"/>
                         <field name="analytic_amount"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object"/>
-                   </group>
+
                </form>
             </field>
         </record>
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 56c18c82b7a..a286938330d 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
@@ -7,23 +7,21 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit">
-					<group height="420" width="370">
-						<group col="4" colspan="4">
-							<field name="date_from"/>
-							<field name="date_to"/>
+                <form string="Timesheet Profit" version="7.0">
+                    <header>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
+                    </header>
+                    <group height="420" width="370">
+                        <group col="4" colspan="4">
+                            <field name="date_from"/>
+                            <field name="date_to"/>
                             <separator string="Journals" colspan="4"/>
-							<field name="journal_ids" colspan="4" nolabel="1"/>
+                            <field name="journal_ids" colspan="4" nolabel="1"/>
                             <separator string="Users" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group col="2" colspan="4">
-							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-						</group>
-					</group>
-				</form>
+                            <field name="employee_ids" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
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 ab857567654..db33fc98aa7 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
@@ -26,8 +26,10 @@
             <field name="model">hr.timesheet.invoice.create.final</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Invoice contract">
-                <group col="4" colspan="6">
+            <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"/>
+                </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -35,12 +37,6 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
-                </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
-                </group>
             </form>
             </field>
         </record>
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 663fc9b58de..0d72d09569e 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,22 +9,19 @@
             <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"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
-                <notebook>
-                    <page string="Billing Data">
-                       <group string="Do you want to show details of work in invoice?">
-                           <field name="date"/>
-                           <field name="time"/>
-                           <field name="name"/>
-                           <field name="price"/>
-                       </group>
-                       <group  string="Force to use a specific product">
-                           <field name="product"/>
-                       </group>
-                    </page>
-                </notebook>
+                <group>
+	                <group string="Do you want to show details of work in invoice?" colspan="4">
+	                    <field name="date"/>
+	                    <field name="time"/>
+	                    <field name="name"/>
+	                    <field name="price"/>
+	                </group>
+	                <group  string="Force to use a specific product" colspan="4">
+	                    <field name="product"/>
+	                </group>
+	            </group>
             </form>
             </field>
         </record>
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 18121813e7d..2c18c2353c0 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -8,10 +8,11 @@
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
                <header>
-                    <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
                </header>
-               <separator string="It will open your current timesheet"/>
+               <group>
+                    <separator string="It will open your current timesheet"/>
+               </group>
            </form>
         </field>
     </record>
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 215de9ba59c..250239ea10c 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Data" version="7.0">
-                    <header>
-                        <button  icon="gtk-ok" special="cancel" string="_Ok"/>
-                    </header>
                     <group>
                         <field name='name'/>
                     </group>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 7df067a643b..8a9eed7fcb1 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -6,7 +6,10 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import contacts from a google account">
+                <form string="Import contacts from a google account" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight"/>
+                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <separator string="Import Options" colspan="4"/>
@@ -18,13 +21,6 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
@@ -36,17 +32,13 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Google Calendar Events">
+                <form string="Import Google Calendar Events" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight"/>
+                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index b960d66f1b1..82581da047b 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -8,7 +8,11 @@
       <field name="model">import.sugarcrm</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Import Data From SugarCRM">
+        <form string="Import Data From SugarCRM" version="7.0">
+          <header>
+	          <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" icon="gtk-execute" class="oe_highlight"/>
+	          <button name="import_all" string="_Import" type="object" icon="terp-camera_test" class="oe_highlight"/>
+          </header>
           <group col="8" >
             <group colspan="2" col="2" width="200">
               <label colspan="2"  string="Import your data from SugarCRM :"/>
@@ -70,16 +74,6 @@
                 <separator string="Multi Instance Management" colspan="4"/>
                 <field name="instance_name" colspan="4"/>
               </group>
-
-              <separator string="" colspan="4" />
-              <group colspan="4" col="6">
-                <label string="" colspan="2"/>
-                <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" icon="gtk-execute" />
-                <button name="import_all" string="_Import"
-                        type="object" icon="terp-camera_test"/>
-              </group>
             </group>
           </group>
         </form>
diff --git a/addons/import_sugarcrm/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml
index 581d862e408..6f1f3fad3c1 100644
--- a/addons/import_sugarcrm/wizard/import_message_view.xml
+++ b/addons/import_sugarcrm/wizard/import_message_view.xml
@@ -8,13 +8,11 @@
             <field name="model">import.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Message">
-                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/> 
-                   <separator string="" colspan="4" />
-                   <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                <form string="Import Message" version="7.0">
+                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
                 </form>
             </field>
         </record>
-        
+
     </data>
-</openerp>        
\ No newline at end of file
+</openerp>
\ No newline at end of file
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 23d3d9d0f6c..3deda45ff0d 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <newline/>
                     <separator string="Wiki" colspan="4"/>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 9b3a48725b9..f44218561ed 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
                     <header>
-                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
-                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <group>
                         <group string="Declare Periodical VAT">
@@ -35,9 +34,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save xml" version="7.0">
-                    <header>
-                        <button special="cancel" string="Ok" icon="gtk-ok"/>
-                    </header>
                     <label string="Save the File with '.xml' extension."/>
                     <field name="name"/>
                     <field name="file_save" readonly="True" filename="name"/>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index ad7ca50cdac..d8deb69c7a1 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -6,17 +6,17 @@
       <field name="model">partner.vat</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Partner VAT Listing">
-          <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+        <form string="Partner VAT Listing" version="7.0">
+          <header>
+            <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight"/>
+          </header>
+          <group>
+            <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+          </group>
           <newline/>
           <field name="year"/>
           <newline/>
           <field name="limit_amount"/>
-          <separator colspan="4"/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            <button colspan="1" name="get_partner" string="View Customers" type="object" icon="terp-partner"/>
-          </group>
         </form>
       </field>
     </record>
@@ -64,16 +64,14 @@
       <field name="type">form</field>
       <field name="priority" eval="1"/>
       <field name="arch" type="xml">
-        <form string="XML File has been Created.">
+        <form string="XML File has been Created." version="7.0">
+            <header>
+                <button name="print_vatlist" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
+            </header>
             <separator string="XML File has been Created." colspan="4"/>
             <label string="Save the File with '.xml' extension." colspan="4" nolabel="1"/>
             <field name="name"/><newline/>
             <field name="file_save"/>
-            <separator colspan="4"/>
-          <group colspan="4">
-            <button colspan="2" special="cancel" string="Close" icon="gtk-cancel"/>
-            <button colspan="2" name="print_vatlist" string="Print" type="object"  icon="gtk-print"/>
-          </group>
         </form>
       </field>
     </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index c851fa0e559..03a77e88950 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -9,11 +9,12 @@
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
                     <header>
-                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
-                        <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight"/>
                     </header>
-                    <separator string="Intracom VAT Declaration"/>
+                    <group>
+                        <separator string="Intracom VAT Declaration"/>
+                    </group>   
                     <notebook colspan="4">
                         <page string="General Information">
                             <group>
@@ -40,9 +41,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save XML" version="7.0">
-                    <header>
-                        <button special="cancel" string="Close" icon="gtk-cancel" colspan="4"/>
-                    </header>
                     <separator string="Note: "/>
                     <label string="Save the File with '.xml' extension."/>
                     <field name="name"/>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 6625aaef9cd..85c8f6caa57 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
                     <header>
-                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="file"/>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 005b491cc8f..28679e69ee8 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
                     <header>
-                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
+                        <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="dta_file"/>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 1f059c69049..a31db83e899 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -9,10 +9,11 @@
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
                    <header>
-                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                    </header>
-                   <field name="fiscalyear_id"/>
+                   <group>
+                        <field name="fiscalyear_id"/>
+                   </group>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 58ad0d8333e..68cf0fe3861 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -9,10 +9,11 @@
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
                     <header>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
+                        <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <field name="fiscalyear_id"/>
+                    <group>
+                        <field name="fiscalyear_id"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 47e9a4ca3f7..56d2865a81c 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
                    <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok" class="oe_highlight"/>
                    </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index c7bf795aafc..a63d0a98480 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
-                        <button  icon="gtk-cancel" special="cancel" string="No"/>
+                        <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"/>
                     </header>
-                    <label string="Are you sure you want to reset this cashbox ?"/>
+                    <group>
+                        <label string="Are you sure you want to reset this cashbox ?"/>
+                    </group>
                </form>
             </field>
           </record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 1bc98f089cb..aa653c60cde 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
-                        <button  icon="gtk-cancel" special="cancel" string="No"/>
+                        <button  icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 9cf41d4d333..a92e7a9a916 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
                     <header>
-                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
-                        <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d559d679c8b..47f5f6509b1 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,7 +6,10 @@
             <field name="model">mail.compose.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Compose Email">
+                <form string="Compose Email" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight"/>
+                    </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -28,11 +31,6 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <label string="" name="placeholder" colspan="1"/>
-                        <button icon="gtk-close" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index acbfc4ad9ba..435708224d0 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Marketing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4" string="Campaigns">
                         <field name="module_marketing_campaign"/>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index e29ef87f141..461e712260a 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
                     <header>
-                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index a00bf797318..bdf0e977005 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <newline/>
                     <group col="4" string="Manufacturing Order">
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index e166e2a96a7..b2dce37cf4c 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -9,17 +9,15 @@
             <field name="model">change.production.qty</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Change Product Qty">
-                    <separator string="Change Quantity" colspan="4"/>
-                    <newline/>
-                    <field name="product_qty"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-stop' special="cancel"
-                            string="Cancel" />
+                <form string="Change Product Qty" version="7.0">
+                    <header>
                         <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" icon="gtk-ok" />
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator string="Change Quantity" colspan="4"/>
+                        <newline/>
+                        <field name="product_qty"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 9bafa51b941..e48346ba89e 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -9,16 +9,14 @@
             <field name="model">mrp.product_price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Cost Structure">
-                    <separator colspan="4" string="Print Cost Structure of Product." />
-                    <field name="number"/>
-                    <newline/>
-                    <separator string="" colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-stop' special="cancel"
-                            string="Cancel" />
-                        <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" />
+                <form string="Product Cost Structure" version="7.0">
+                    <header>
+                            <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight" />
+                    </header>
+                    <group>
+                        <separator colspan="4" string="Print Cost Structure of Product." />
+                        <field name="number"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index c0576405788..6b99c5b19a9 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -10,19 +10,16 @@
             <field name="model">mrp.product.produce</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Produce">
-                    <separator string="Produce" colspan="4"/>
-                    <field name="mode" colspan="4"/>
-                    <field name="product_qty" colspan="2"/>
-                    <newline/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <group col="2" colspan="1">
-                        <button icon='gtk-stop' special="cancel"
-                            string="Cancel" />
+                <form string="Produce" version="7.0">
+                    <header>
                         <button name="do_produce" string="Confirm"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator string="Produce" colspan="4"/>
+                        <field name="mode"/>
+                        <field name="product_qty" colspan="2"/>
+                    </group>    
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index 79a7df1a6a0..b4a4fe05342 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -9,16 +9,17 @@
             <field name="model">mrp.workcenter.load</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select time unit">
-                    <field name="time_unit"/>
-                    <newline/>
-                    <field name="measure_unit"/>
-                    <newline/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-stop' special="cancel"
-                            string="Cancel" />
+                <form string="Select time unit" version="7.0">
+                    <header>
                         <button name="print_report" string="Print"
-                            colspan="1" type="object" icon="gtk-print" />
+                            colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <sheet layout="auto">
+                            <field name="time_unit"/>
+                            <newline/>
+                            <field name="measure_unit"/>
+                        </sheet>
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 21d4948096e..9c27fe49232 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -70,11 +70,11 @@ class repair_cancel(osv.osv_memory):
         repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
         if not repair_order.invoiced:
             res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                              <header>
+                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok" class="oe_highlight"/>
+                              </header>
                             <group col="2" colspan="2">
                                 <label string="Do you want to continue?" colspan="4"/>
-                                <separator colspan="4"/>
-                                <button icon="gtk-stop" special="cancel" string="_No" readonly="0"/>
-                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok"/>
                             </group>
                         </form>                             
                     """
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index dd0be7b053e..75a3f004f20 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -11,10 +11,12 @@
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
                     <header>
-                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" />
-                        <button icon="gtk-stop" special="cancel" string="No" />
+                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_highlight" />
                     </header>
-                    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+                    <newline/>
+                    <group>
+                        <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+                    </group>
                 </form>
             </field>
         </record>         
@@ -27,7 +29,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record> 
-         
         
     </data>
 </openerp>    
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 8fd88a5fd38..a65c3c3f02b 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
                 <header>
-                    <button icon="gtk-stop" special="cancel" string="Cancel" />
-                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" />
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c4791ee153c..f94fccc89e5 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,11 +14,6 @@
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                    </xpath>
                    <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" widget="url" colspan="4"/>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ec9a8c72610..d54c22cb5da 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -14,10 +14,6 @@
                      <separator string="title" position="before">
                         <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
                     </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="thunderbird" invisible="1"/>
@@ -48,7 +44,7 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
         </record>
-    
+
         <!-- Sales Configuration -->
         <record id="view_config_thunderbird_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index bf371ee37ae..8e58cbc5adb 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -10,10 +10,11 @@
             <field name="arch" type="xml">
                 <form string="Put Money" version="7.0">
                     <header>
-                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" />
-                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight" />
                     </header>
-                    <separator string="Fill in this form if you put money in the cash register:"/>
+                    <group>
+                        <separator string="Fill in this form if you put money in the cash register:"/>
+                     </group>
                     <group col="4">
                         <field name="name"/>
                         <field name="product_id"/>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index d9d2cf1e37b..46aabde5be0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -10,8 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Output Operation" version="7.0">
                     <header>
-                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" />
-                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" class="oe_highlight" />
                     </header>
                     <group col="4" string="Describe why you take money from the cash register:">
                         <field name="name"/>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 0231427dc8c..293e95ad056 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -11,11 +11,9 @@
                 <form string="Close Cash Registers" version="7.0">
                     <header>
                         <button name="close_statement" string="Yes"
-                             type="object" icon="gtk-ok"/>
-                        <button icon='gtk-stop' special="cancel"
-                            string="No" invisible="context.get('cancel_action')"/>
+                             type="object" icon="gtk-ok" class="oe_highlight"/>
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
-                            string="No" invisible="not context.get('cancel_action')"/>
+                            string="No" invisible="not context.get('cancel_action')" class="oe_highlight"/>
                     </header>
                     <separator string="Do you want to close your cash registers?"/>
                     <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 1a63a8e9407..b6f95c32419 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Post All Orders" version="7.0">
                     <header>
-                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok"/>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Generate Journal Entries"/>
                     <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index caf49000e45..39a292455e9 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -10,10 +10,8 @@
             <field name="arch" type="xml">
                 <form string="POS Details" version="7.0">
                     <header>
-                            <button icon='gtk-cancel' special="cancel"
-                                    string="Close" />
                             <button name="print_report" string="Print Report"
-                                    colspan="1" type="object" icon="gtk-print" />
+                                    colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group col="4" string="Dates">
                         <field name="date_start"/>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 89ee1a8c08a..4b654de3ab7 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -10,10 +10,11 @@
             <field name="arch" type="xml">
                 <form string="Apply Discount" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Close" />
-                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" />
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <field name="discount"/>
+                    <group>
+                        <field name="discount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 7ee9b206e0b..4630498abf6 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -11,8 +11,7 @@
                 <form string="Open Statements" version="7.0">
                     <header>
                          <button name="open_statement" string="Open Registers"
-                             type="object" icon="gtk-ok"/>
-                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                             type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Do you want to open cash registers?"/>
                     <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index d7eaf23334b..58be64d465c 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Add payment :" version="7.0">
                 <header>
-                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
-                    <button icon="gtk-stop" special="cancel" string="Cancel"/>
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply" class="oe_highlight"/>
                 </header>
                 <group col="4">
                     <field name="journal"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 9c202c8c3c6..fe2157370a1 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -9,8 +9,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Report" version="7.0">
-                    <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
-                    <button icon='gtk-cancel' special="cancel" string="Close" />
+                    <header>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                    </header>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index 4421d5263b8..2a3846121a8 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -10,8 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Pyament Report " version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
-                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                 </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 07cafd997ed..75476d748f0 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
                     <header>
-                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
-                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="user_id"/>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 8580890f594..fc9bbfe7a5d 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -11,10 +11,11 @@
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
                     <header>
-                      <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" />
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight"/>
                     </header>
-                    <label string="Print the Receipt of the Sale"/>
+                    <group>
+                        <label string="Print the Receipt of the Sale"/>
+                    </group>    
                 </form>
               </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 3d735f87fb7..68ccd110e14 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,8 +7,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
-                    <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    <header>
+                        <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object" class="oe_highlight"/>
+                    </header>
                  </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index 95a1a3d7e6f..dad172d610a 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -10,10 +10,8 @@
             <field name="arch" type="xml">
                 <form string="Sale By User" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Close" />
                         <button name="print_report" string="Print Report"
-                            type="object" icon="gtk-ok" />
+                            type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date_start"/>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index d35ce5e240b..b1b763f4812 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -18,9 +18,8 @@
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
                     <header>
-                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button string="Send Invitations"
-                            name="action_create" type="object" icon="gtk-ok"/>
+                            name="action_create" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 74007305ab7..5e533cc239a 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -11,10 +11,10 @@
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
                     <header>
-                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
+                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
+                     <group>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="qty"/>
                         <field name="uom_id"/>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index dd75f916f6e..95f60581511 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -12,10 +12,11 @@
                 <form string="Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Procurements"
-                            type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                            type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <label string="This wizard will schedule procurements."/>
+                    <group>
+                        <label string="This wizard will schedule procurements."/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 051abea849d..0aaeb848853 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+                    <group>
+                        <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+                    </group>
                     <group col="2">
                         <field name="automatic"/>
                     </group>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index a2f987e3aa1..0e2e8cf51d6 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 5b966c6ca2c..14ad2217b75 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -11,8 +11,7 @@
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print" class="oe_highlight"/>
                     </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 69ff481ce95..33492f787f5 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute" class="oe_highlight"/>
                     </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 18c7875fcdc..3f658457fb5 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Project" colspan="4"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9ed920eb534..67500a0b7ed 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 4a452bca3ab..9504296e941 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index 9beb118cdcc..e166d997226 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Empty Timebox" version="7.0">
-                    <header>
-                        <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-                    </header>
                     <label string="Timebox Empty Process Completed Successfully." />
                 </form>
             </field>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 6a38ccdb6a6..dfb41206552 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" class="oe_highlight"/>
                     </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 37c7256cb7c..91d06bdb52b 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
                       </header>
                       <group>
                           <field name="target_project"/>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 3ceac7e9a9e..c42b3dbc674 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 47ff616b548..775aebfaa8f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
 
         # - determine product_qty and date_planned based on seller info
         if not date_order:
-            date_order = fields.date.context_today(cr,uid,context=context)
+            date_order = fields.date.context_today(self,cr,uid,context=context)
 
         qty = qty or 1.0
         supplierinfo = False
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index e7be392b0c2..a8f845533a1 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Invoicing" colspan="4"/>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 40f081076f6..b8977795383 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" />
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <label string="Do you want to generate the supplier invoices?"/>
+                    <group>
+                        <label string="Do you want to generate the supplier invoices?"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 50c75668068..9da3220057a 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -8,11 +8,11 @@
             <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"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_highlight"/>
                     </header>
-                    <separator string="Are you sure you want to merge these orders?"/>
-                    <label string="
+                    <group>
+                        <separator string="Are you sure you want to merge these orders?"/>
+                        <label string="
 Please note that: &#10; &#10;
 Orders will only be merged if: &#10;
 * Purchase Orders are in draft &#10;
@@ -21,6 +21,8 @@ Orders will only be merged if: &#10;
 Lines will only be merged if: &#10;
 * Order lines are exactly the same except for the product,quantity and unit &#10;
 " colspan="4"/>
+                    </group>
+                    
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 62d9e605600..fda497a1a1f 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <header>
-                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="partner_id"/>
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index f6b920944d4..30aab0957d2 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -77,11 +77,6 @@ class report_webkit_actions(osv.osv_memory):
         if ids:
             res['arch'] = '''<form string="Add Print Buttons">
                                  <label string="Report Action already exist for this report."/>
-                                 <separator colspan="4"/>
-                                 <group col="2" colspan="4">
-                                     <button icon='gtk-cancel' special="cancel"
-                                         string="_Cancel" />
-                                 </group>
                              </form> 
                             '''
         
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 223c23f595f..847e2b53748 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -9,8 +9,7 @@
             <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" />
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_highlight"/>
                     </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 84c19665e65..7dac4295849 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,8 +8,7 @@
             <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"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                 </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 8129d5ee24d..6abd4367243 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -8,8 +8,7 @@
             <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"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                     </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 67b20e6e288..ab25bc4058d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -8,9 +8,8 @@
             <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}"/>
-                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}" class="oe_highlight"/>
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" class="oe_highlight"/>
                     </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 39546037c1f..a5947bb1515 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -10,8 +10,7 @@
           <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'/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward' class="oe_highlight"/>
                 </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 1c9bb011432..b62a05549a2 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,8 +9,7 @@
             <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"/>
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -31,11 +30,12 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward"/>
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
-                    <field name="user_type" invisible="1"/>
-                    <field name="invite" invisible="1"/>
+                    <group>
+                        <field name="user_type" invisible="1"/>
+                        <field name="invite" invisible="1"/>
+                    </group>    
                     <group>
                         <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
@@ -64,7 +64,6 @@
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
                     <header>
-                        <button special="cancel" string="Close" icon='gtk-ok'/>
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
                     </header>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 77bf887c13d..1cd7ada7fab 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Traceability" colspan="4"/>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 057f0674a64..eaa5efbb58f 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
                     <header>
-                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index a18f5b63f86..604d3015495 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
                   <header>
-                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
-                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply" class="oe_highlight"/>
                   </header>
                   <separator string="Change Price"/>
                   <group>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 527b0de2e9a..d0c412a0716 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
                   <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
-                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok" class="oe_highlight"/>
                   </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index e8b31d94541..b42445c639b 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 9e6dd45d114..f9d0ba4aeff 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -9,11 +9,12 @@
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
                     <header>
-                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
-                        <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
-                    <separator string="Merge Inventories" />
-                    <label string="Do you want to merge theses inventories?"/>
+                    <group>
+                        <separator string="Merge Inventories" />
+                    </group>
+                        <label string="Do you want to merge theses inventories?"/>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index ba158bba1e4..be95fb79a0e 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
                   <header>
-                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl" class="oe_highlight"/>
                   </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 09ac798ea1c..90728d302d5 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -8,10 +8,11 @@
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
                     <header>
-                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel" />
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <separator string="Stock Location Analysis"/>
+                    <group>
+                        <separator string="Stock Location Analysis"/>
+                    </group>
                     <group>
                         <field name="from_date"/>
                         <field name="to_date"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 36c28075595..b7642bd4a51 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -10,19 +10,20 @@
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" />
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
-                    <separator string="Consume Products"/>
-                    <div>
-                        <field name="product_id" readonly="1"/>
-                        <label for="product_qty"/>
+                    <group>
+                        <separator string="Consume Products"/>
                         <div>
-                            <field name="product_qty"/>
-                            <field name="product_uom" nolabel="1" readonly="1"/>
+                            <field name="product_id" readonly="1"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty"/>
+                                <field name="product_uom" nolabel="1" readonly="1"/>
+                            </div>
+                            <field name="location_id"/>
                         </div>
-                        <field name="location_id"/>
-                    </div>
+                    </group>
                 </form>
             </field>
         </record>
@@ -43,8 +44,7 @@
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" />
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <separator string="Scrap Products"/>
                     <group>
@@ -76,8 +76,7 @@
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
                     <group>
                         <field name="product_id" readonly="1"/>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 80b64f3ae75..41340fd36eb 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -22,11 +22,12 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" />
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
-                    <separator string="Products"/>
-                    <field name="move_ids"/>
+                    <group>
+                        <separator string="Products"/>
+                        <field name="move_ids"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 764e345fac2..23bd96b6efe 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -17,11 +17,12 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" />
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <field name="hide_tracking" invisible="1"/>
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
-                    <separator string="Transfer Products" name="product_separator"/>
+                    <group>
+                        <field name="hide_tracking" invisible="1"/>
+                        <separator string="Transfer Products" name="product_separator"/>
+                    </group>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
                         <tree editable="bottom" string="Product Moves">
                             <field name="product_id" />
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 63f85d79945..1cefaa820c8 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -60,10 +60,11 @@
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <header>
-                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" />
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" class="oe_highlight"/>
                     </header>
-                    <label string="Provide the quantities of the returned products."/>
+                    <group>
+                        <label string="Provide the quantities of the returned products."/>
+                    </group>
                     <group>
                         <field name="product_return_moves"/>
                         <field name="invoice_state" />
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 35329230aee..cb0ad239206 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
                 <header>
-                    <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                    <button name="split" string="Ok" type="object" icon="gtk-ok" />
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                 </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index bdfe240b106..9b45a0aaa10 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,10 +10,9 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <header>
-                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
-                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
-                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object" class="oe_highlight"/>
+                        <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
+                        <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="date_start"/>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 2ebddb89212..0b83403e58c 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 72c94abf128..1267038ebe0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -10,8 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
                     <header>
-                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" />
-                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                        <button icon="gtk-execute" name="create_forecast" string="Create" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <field name="period_id"/>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index a2069cfdb9a..625d51c00e1 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -13,8 +13,7 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator colspan="4"  string =  "Select Survey and Related Answer"/>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index bbafb79ab61..f2c13012bdb 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
                     <header>
-                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-                        <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 265c56ee1c6..2594dc5d128 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index e2c064c6a14..ba0ef18bc05 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -11,10 +11,11 @@
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                     </header>
-                    <field name="survey_ids"/>
+                    <group>
+                        <field name="survey_ids"/>
+                    </group>    
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 940ac7833b2..f020e050dcc 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -12,8 +12,7 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_highlight"/>
                     </header>
                     <group string="Select Survey">
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 12c4df8bd69..c508b6d2e01 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -11,8 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
@@ -55,9 +54,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User creation" version="7.0">
-                    <header>
-                        <button icon="gtk-ok" special="cancel" string="_Ok"/>
-                    </header>
                     <group string="Results :">
                         <field name="note"/>
                     </group>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index fbdffb23e0a..010e99dd3f2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -9,15 +9,16 @@
             <field name="model">wiki.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                     <separator string="Menu Information" colspan="4" />
-                    <field name="menu_name" />
-                    <field name="menu_parent_id" />
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <button special="cancel" string="Cancel" />
-                    <button name="wiki_menu_create" string="Create Menu" type="object"/>
-             </form>
+                <form string="Create Menu" version="7.0">
+                    <header>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator string="Menu Information" colspan="4" />
+                        <field name="menu_name" />
+                        <field name="menu_parent_id" />
+                    </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 28b0d8427b0..8ebf1b30ea4 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -9,16 +9,15 @@
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                <separator string="Menu Information" colspan="4"/>
-                <label string="Want to create a Index on Selected Pages ? "/>
-                <separator string="" colspan="6" />
-                <label string="" colspan="2"/>
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
-                </group>
-            </form>
+                <form string="Create Menu" version="7.0">
+                    <header>
+                        <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
+                    <group>
+	                    <separator string="Menu Information" colspan="4"/>
+	                    <label string="Want to create a Index on Selected Pages ? "/>
+	                </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index 8cc394986d8..55e6905b188 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -9,14 +9,10 @@
             <field name="model">wizard.wiki.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Difference">
-                 <separator colspan="4" string="Notes"/>
-                  <field name="file_path" colspan="4" width="300"/>
-                <label string="" colspan="2" />
-                <group>
-                <button special="cancel" string="Close" icon="gtk-close" />
-                </group>
-            </form>
+                <form string="Difference">
+                    <separator colspan="4" string="Notes"/>
+                    <field name="file_path" colspan="4" width="300"/>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index a625d15e92a..eaacff551d9 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -9,15 +9,14 @@
             <field name="model">wiki.wiki.page.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Open Page">
-                 <separator string="" colspan="6" />
-                  <label string="Want to open a wiki page? "/>
-                  <separator string="" colspan="6" />
-                <label string="" colspan="2" />
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                   <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
-                   </group>
+                <form string="Open Page" version="7.0">
+                    <header>
+                        <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_highlight"/>
+                    </header>
+                    <group>
+                        <separator string="" colspan="6" />
+                        <label string="Want to open a wiki page? "/>
+                    </group>    
              </form>
             </field>
         </record>