diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index bf371ee37ae..751aa4a3e67 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -10,8 +10,7 @@
             <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_form_button_active_flow" />
                     </header>
                     <separator string="Fill in this form if you put money in the cash register:"/>
                     <group col="4">
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index d9d2cf1e37b..4f0577464e1 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_form_button_active_flow" />
                     </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..1cca490f6ea 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_form_button_active_flow"/>
                         <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_form_button_active_flow"/>
                     </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..c2d6a34e121 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_form_button_active_flow"/>
                     </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..117b7484b90 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_form_button_active_flow"/>
                     </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..3146b714ce4 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -10,8 +10,7 @@
             <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_form_button_active_flow"/>
                     </header>
                     <field name="discount"/>
                 </form>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 7ee9b206e0b..8c7b433268c 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_form_button_active_flow"/>
                     </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..77d5965fa80 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_form_button_active_flow"/>
                 </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..85cdfc68f3d 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_form_button_active_flow"/>
+                    </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..dc8bbaeefef 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_form_button_active_flow"/>
                     </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..6c785c9662d 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_form_button_active_flow"/>
                     </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..9d9bd1c59b9 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -11,8 +11,7 @@
               <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_form_button_active_flow"/>
                     </header>
                     <label string="Print the Receipt of the Sale"/>
                 </form>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 3d735f87fb7..9d6f6203822 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_form_button_active_flow"/>
+                    </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..0e50b44991f 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_form_button_active_flow"/>
                     </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..3f6f9c04b63 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_form_button_active_flow"/>
                     </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>