diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 52a742692a4..3ac1b8450f5 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_form_button_active_flow"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" class="oe_form_button_active_flow"/>
                     <button name="button_done" string="Done" states="progress" type="object" class="oe_form_button_active_flow"/>
-                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" class="oe_form_button_return_flow"/>
                     <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>
@@ -278,11 +278,10 @@
                         <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_form_button_active_flow"/>
                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" class="oe_form_button_active_flow"/>
                         <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-
                         <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
+                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_form_button_active_flow"/>
+                        <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                         <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_form_button_active_flow"/>
-
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 8b6d81ef18c..7c81ae614c7 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -69,7 +69,7 @@
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
                     <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="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
-                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 34cb7af6948..a7b4d8b29c1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -77,7 +77,7 @@
                 <button name="case_open" string="Open" type="object"
                         states="draft,pending" class="oe_form_button_active_flow"/>
                 <button name="case_pending" string="Pending" type="object"
-                        states="open"/>
+                        states="open" class="oe_form_button_return_flow"/>
                 <button name="case_reset" string="Reset to New" type="object"
                         states="done,cancel" class="oe_form_button_return_flow"/>
                 <button name="case_cancel" string="Refuse" 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 debb84e0c7c..e97fcd0272a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,7 +24,7 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
-                        <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
+                        <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                         <button name="set_close" string="Close" type="object" states="open,pending" class="oe_form_button_active_flow"/>
                         <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="cancelled,draft"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a65db02d0d6..e25fdc4f969 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -23,7 +23,7 @@
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
                     <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_active_flow"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <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_form_button_active_flow"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
@@ -331,7 +331,7 @@
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_form_button_return_flow"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 87ca1a9f6c8..e4839017e72 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -135,7 +135,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
@@ -145,8 +145,8 @@
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft" class="oe_form_button_active_flow"/>
                     <button string="Done" name="set_done" states="pending,open" class="oe_form_button_active_flow"/>
-                    <button string="Pending" name="set_pending" states="open" class="oe_form_button_active_flow"/>
-                    <button string="Draft" name="set_draft" states="open"/>
+                    <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="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/sale/sale_view.xml b/addons/sale/sale_view.xml
index c86b2ceb4c8..1d198936da6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,7 +109,7 @@
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_form_button_active_flow"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_form_button_active_flow"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_form_button_active_flow"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                         <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_active_flow" type="object"/>
@@ -117,7 +117,7 @@
                           attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_form_button_active_flow"
                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
-                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual" class="oe_form_button_active_flow"/>
+                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>
                         <button name="cancel" states="draft,sent" string="Cancel"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>