diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index be54110d641..8c65a62b156 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,8 +8,8 @@
             <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_form_button_active_flow"/>
                     </header>
                     <sheet layout="auto">
                         <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..80aa69ecc23 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -9,18 +9,16 @@
             <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" />
-                    </group>
+                            colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    </header>
+                    <sheet layout="auto">
+                        <separator string="Change Quantity" colspan="4"/>
+                        <newline/>
+                        <field name="product_qty"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 9bafa51b941..7cf2ddb04d9 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -9,17 +9,15 @@
             <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" />
-                    </group>
+                <form string="Product Cost Structure" version="7.0">
+                    <header>
+                            <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
+                    </header>
+                    <sheet layout="auto">
+                        <separator colspan="4" string="Print Cost Structure of Product." />
+                        <field name="number"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index c0576405788..a260a5339c3 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_form_button_active_flow"/>
+                    </header>
+                    <sheet layout="auto">
+                        <separator string="Produce" colspan="4"/>
+                        <field name="mode" colspan="4"/>
+                        <field name="product_qty" colspan="2"/>
+                    </sheet>
                 </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..28b6a9c0e17 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -9,17 +9,16 @@
             <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" />
-                    </group>
+                            colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    </header>
+                    <sheet layout="auto">
+                        <field name="time_unit"/>
+                        <newline/>
+                        <field name="measure_unit"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 21d4948096e..45f39c88149 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_form_button_active_flow"/>
+                              </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..b3aad3d61d3 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -11,8 +11,7 @@
             <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_form_button_active_flow" />
                     </header>
                     <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                 </form>
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..4de44cd86a9 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,8 @@
             <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_form_button_active_flow"/>
                 </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>