diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c4ba4a97aff..75561bb1167 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -149,9 +149,9 @@
                 <form version="7.0">
                 <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' class="oe_form_button_return_flow"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" />
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
@@ -278,9 +278,9 @@
                     <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices" class="oe_highlight"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid' class="oe_form_button_return_flow"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid' />
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"  class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"  />
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 7adda71bc2f..77d4b6a6e3e 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -83,7 +83,7 @@
                 <header>
                     <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight"/>
                     <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight"/>
-                    <button name="set_to_draft" states="open" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
+                    <button name="set_to_draft" states="open" string="Set to Draft" type="object" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index cf5b277eda0..7af55a52c74 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -113,7 +113,7 @@
                     <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
                     <button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/>
-                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow" class="oe_form_button_return_flow"/>
+                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow" />
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 4165d5d5782..7b89b731872 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -106,7 +106,7 @@
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
                     <button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
-                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" class="oe_form_button_return_flow"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" />
                     <button name="cancel" states="draft,open" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index fd682db24bf..884ee25ad71 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -147,8 +147,8 @@
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" class="oe_form_button_return_flow"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" class="oe_form_button_return_flow"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" />
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
@@ -299,8 +299,8 @@
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" class="oe_form_button_return_flow"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" class="oe_form_button_return_flow"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?" />
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 060942bfaee..13578c27a50 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -86,7 +86,7 @@
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
@@ -223,7 +223,7 @@
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
                     <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e63188ee091..25b9e8c1c54 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -83,7 +83,7 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"  class="oe_form_button_return_flow"
+                    <button name="case_escalate" string="Escalate" type="object"  
                             states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
@@ -404,11 +404,11 @@
                     <button name="case_open" string="Open" type="object" class="oe_highlight"
                             states="draft,pending"/>
                     <button name="case_escalate" string="Escalate" type="object"
-                            states="open" class="oe_form_button_return_flow"/>
+                            states="open" />
                     <button name="case_mark_lost" string="Mark Lost" type="object"
                             states="draft,open"/>
                     <button name="case_reset" string="Reset to Draft" type="object"
-                            states="done,cancel" class="oe_form_button_return_flow"/>
+                            states="done,cancel" />
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
                     <field name="stage_id" widget="statusbar"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c795b1de016..dfe6a3ed8a1 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -31,7 +31,7 @@
                             states="draft"/>
                     <button name="case_close" string="Done" type="object" class="oe_highlight"
                             states="open"/>
-                    <button name="case_reset" string="Reset to Unconfirmed" type="object" class="oe_form_button_return_flow"
+                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 58ca80db78b..9c6e730963f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -100,7 +100,7 @@
                             states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
                     <button name="stage_next" string="Next Stage" type="object"
                             states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                    <button name="case_reset" string="Reset to Draft" type="object" class="oe_form_button_return_flow"
+                    <button name="case_reset" string="Reset to Draft" type="object" 
                             states="cancel,done"/>
                     <button name="case_cancel" string="Cancel" type="object" 
                             states="draft,open,pending"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index f556e01bdd6..fb7ed40af42 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -66,8 +66,8 @@
                     <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" class="oe_form_button_return_flow"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" class="oe_form_button_return_flow"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 317050ae1d2..ea3c398a72a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -36,11 +36,11 @@
                     <button name="case_close" string="Close" type="object" states="open" class="oe_highlight"/>
                     <button name="case_pending" string="Pending" type="object"
                             states="draft"/>
-                    <button name="case_pending" string="Pending" type="object" class="oe_form_button_return_flow"
+                    <button name="case_pending" string="Pending" type="object" 
                             states="open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object" class="oe_form_button_return_flow"
+                    <button name="case_reset" string="Reset to Draft" type="object" 
                             states="cancel,done"/>
-                    <button name="case_escalate" string="Escalate" type="object" class="oe_form_button_return_flow"
+                    <button name="case_escalate" string="Escalate" type="object" 
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 74301a4b5d5..ab21cb1ac52 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -56,7 +56,7 @@
                 <header>
                     <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
                     <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
@@ -357,7 +357,7 @@
                 <header>
                     <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
                     <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 4901eb3e76f..cda005ce22e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -151,7 +151,7 @@
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" class="oe_highlight"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_highlight"/>
                     <button name="button_done" string="Done" states="progress" type="object" class="oe_highlight"/>
-                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" class="oe_form_button_return_flow"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" />
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </header>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 4f230d39deb..8b001940a3f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,9 +67,9 @@
                 <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e606e970cf1..c9f2176b365 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -69,7 +69,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
+                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request" layout="auto">
@@ -118,7 +118,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
+                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 100af60cdb1..d8d83b286bf 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -259,7 +259,7 @@
                 <form string="Payslip" version="7.0">
                 <header>
                     <button string="Confirm" name="hr_verify_sheet" states="draft" class="oe_highlight"/>
-                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object' class="oe_form_button_return_flow"/>
+                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object' />
                     <button string="Set to Draft" name="draft" states="cancel"/>
                     <button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_highlight"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
@@ -725,7 +725,7 @@
                 <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_highlight"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_highlight"/>
-                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" class="oe_form_button_return_flow"/>
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" />
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index be64dec1a49..439ae8d6f04 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -86,9 +86,9 @@
                 <button name="case_open" string="Open" type="object"
                         states="draft,pending" class="oe_highlight"/>
                 <button name="case_pending" string="Pending" type="object"
-                        states="open" class="oe_form_button_return_flow"/>
+                        states="open" />
                 <button name="case_reset" string="Reset to New" type="object"
-                        states="done,cancel" class="oe_form_button_return_flow"/>
+                        states="done,cancel" />
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
                 <button name="stage_previous" string="Previous" type="object"
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index ee1928fbbb0..4e6f5dc5288 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,9 +24,9 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
-                        <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
+                        <button name="set_pending" string="Pending" type="object" states="open" />
                         <button name="set_close" string="Close" type="object" states="open,pending" class="oe_highlight"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,close" class="oe_form_button_return_flow"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,close" />
                         <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3405e0a45a7..4ed6ec8eea8 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -66,8 +66,8 @@
                 <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
-                    <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
+                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" />
+                    <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
                 <sheet>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 457e22107b9..74100ee3515 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -26,7 +26,7 @@
                 <form version="7.0">
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
-                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" class="oe_form_button_return_flow"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 7ba16765efe..117fe5ac881 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -19,7 +19,7 @@
             <header>
                 <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
                 <button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" class="oe_form_button_return_flow"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" />
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
@@ -137,7 +137,7 @@
             <header>
                 <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
                 <button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" class="oe_form_button_return_flow"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" />
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b6dc839e709..dc2460310d9 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -72,8 +72,8 @@
                 <button name="button_start_working" string="Start" states="draft" class="oe_highlight"/>
                 <button name="button_resume" string="Resume" states="pause" class="oe_highlight"/>
                 <button name="button_done" string="Finished" states="startworking" class="oe_highlight"/>
-                <button name="button_pause" string="Pending" states="startworking" class="oe_form_button_return_flow"/>
-                <button name="button_draft" string="Set Draft" states="cancel" class="oe_form_button_return_flow"/>
+                <button name="button_pause" string="Pending" states="startworking" />
+                <button name="button_draft" string="Set Draft" states="cancel" />
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
             </header>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 61d137c843a..8bc1f68d665 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -31,7 +31,7 @@
                <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_highlight"/>
                    <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
-                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
+                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" />
                    <button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
                    <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 0ebbe0fd38e..8a7549cdad0 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -23,7 +23,7 @@
                     <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}" class="oe_highlight"/>
                     <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid" class="oe_highlight"/>
                     <button name="refund" string="Return Products" type="object"
-                        attrs="{'invisible':[('state','=','draft')]}" class="oe_form_button_return_flow"/>
+                        attrs="{'invisible':[('state','=','draft')]}" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                 </header>
                 <sheet>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b1be15caf88..320be4fcb2d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -22,8 +22,8 @@
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
+                    <button name="set_pending" string="Pending" type="object" states="open" />
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@@ -332,7 +332,7 @@
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done" class="oe_form_button_return_flow"/>
+                                states="cancel,done" />
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
@@ -343,7 +343,7 @@
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_return_flow"/>
+                                states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6fa823bbccb..84252bc09ee 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -61,11 +61,11 @@
                      <button name="case_close" string="Done" type="object"
                             states="draft,pending"/>
                     <button name="case_pending" string="Pending" type="object"
-                            states="draft,open" class="oe_form_button_return_flow"/>
+                            states="draft,open" />
                     <button name="case_escalate" string="Escalate" type="object"
-                            states="draft,open,pending" class="oe_form_button_return_flow"/>
+                            states="draft,open,pending" />
                     <button name="case_reset" string="Reset to New" type="object"
-                            states="cancelled,done" class="oe_form_button_return_flow"/>
+                            states="cancelled,done" />
                     <button name="stage_previous" string="Previous Stage" type="object"
                             states="open,pending" icon="gtk-go-back"
                             attrs="{'invisible': [('stage_id','=', False)]}"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8891e5f777c..2dc5137b4ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_highlight"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_return_flow"/>
-                    <button string="Draft" name="set_draft" states="open" class="oe_form_button_return_flow"/>
+                    <button string="Pending" name="set_pending" states="open" />
+                    <button string="Draft" name="set_draft" states="open" />
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a74193bd247..dc8723142ff 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -138,7 +138,7 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </header>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index dc84ef36fcb..a65d629b1e3 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -35,7 +35,7 @@
             <form string="Purchase Requisition" version="7.0">
             <header>
                 <button name="tender_in_progress" states="draft" string="Start" type="object" class="oe_highlight"/>
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" class="oe_form_button_return_flow"/>
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
                 <button name="tender_done" states="in_progress" string="Done" type="object" class="oe_highlight"/>
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e2d86f67b9e..75d79d234c8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -114,8 +114,8 @@
                 <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
-                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" class="oe_form_button_return_flow"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" />
+                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
@@ -722,7 +722,7 @@
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
                     <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" class="oe_form_button_return_flow"/>
+                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
@@ -956,7 +956,7 @@
                 <data>
                     <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
@@ -1075,7 +1075,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" class="oe_form_button_return_flow"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="//button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 8bb7d0518bf..c17d9d00381 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -17,7 +17,7 @@
                 <header>
                     <button name="set_process" states="draft" string="Process" type="object" class="oe_highlight"/>
                     <button name="set_done" states="running" string="Stop" type="object" class="oe_highlight"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
                 <sheet>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 17dc2d6d629..ec0fdcf1fa8 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -20,9 +20,9 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                 <header>
-                    <button name="survey_open" string="Open" states="cancel,close" type="object" class="oe_form_button_return_flow"/>
+                    <button name="survey_open" string="Open" states="cancel,close" type="object" />
                     <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
-                    <button name="survey_cancel" string="Cancel" states="open" type="object" class="oe_form_button_return_flow"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object" />
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
@@ -1060,7 +1060,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" />
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_highlight"/>
                     <button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_highlight"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>