diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 74007305ab7..8551673c925 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -11,8 +11,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index dd75f916f6e..3e205659da2 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -12,8 +12,7 @@
                 <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_form_button_active_flow"/>
                     </header>
                     <label string="This wizard will schedule procurements."/>
                 </form>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 051abea849d..326022e5af1 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -11,8 +11,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     <group col="2">
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index cdd7be0de1f..c9e70ef6678 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -11,8 +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 icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
                     </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/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index de3e91ee183..08cd1d3ab28 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_form_button_active_flow"/>
                     </header>
                     <sheet>
                         <group col="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..8942ec50542 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_form_button_active_flow"/>
                     </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..f76c7b7d057 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_form_button_active_flow"/>
                   </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..6a798d52d33 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_form_button_active_flow"/>
                   </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..9343697fcc6 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_form_button_active_flow"/>
                     </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..1e106320d97 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -9,8 +9,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <separator string="Merge Inventories" />
                     <label string="Do you want to merge theses inventories?"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index ba158bba1e4..e509d7f5b70 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_form_button_active_flow"/>
                   </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..0af746ae45c 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -8,8 +8,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 1cf08d8cadf..8f4c4897b14 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -10,8 +10,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <separator string="Consume Products"/>
                     <div>
@@ -43,8 +42,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_form_button_active_flow"/>
                     </header>
                     <separator string="Scrap Products"/>
                     <group>
@@ -76,8 +74,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_form_button_active_flow"/>
                     </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 722486c81fa..c2754d1966e 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -22,8 +22,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <separator string="Products"/>
                     <field name="move_ids"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 76f457e364a..8be82b1823c 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -17,8 +17,7 @@
             <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" />
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
                         <field name="hide_tracking" invisible="1"/>
                     </header>
                     <separator string="Transfer Products" name="product_separator"/>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 63f85d79945..9cc1234e3a1 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -60,8 +60,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <label string="Provide the quantities of the returned products."/>
                     <group>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 35329230aee..88ce97a0a9b 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_form_button_active_flow"/>
                 </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..f6d678d7eb5 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,8 +10,7 @@
             <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 Daily Periods" type="object" class="oe_form_button_active_flow"/>
                         <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'}"/>
                     </header>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 2ebddb89212..5e63e09a635 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_form_button_active_flow"/>
                     </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..833ccbe56d5 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_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="period_id"/>