diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index fd527209e12..333f00a53dc 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -356,8 +356,8 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                        <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_form_button_active_flow"/>
+                        <button name="job_open" string="In Position" states="old,recruit" type="object" class="oe_form_button_return_flow"/>
                         <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 710c33f12b9..52a742692a4 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -148,9 +148,9 @@
             <field name="arch" type="xml">
                 <form string="Appraisal" version="7.0">
                 <header>
-                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
-                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
-                    <button name="button_done" string="Done" states="progress" type="object"/>
+                    <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_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
@@ -275,13 +275,13 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
-                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
-                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                        <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)]}"/>
-                        <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"/>
+                        <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 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>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e57f20734eb..8b6d81ef18c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -65,10 +65,10 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet" version="7.0">
                 <header>
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
-                    <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"/>
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_form_button_active_flow"/>
+                    <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" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 62223922163..1b7dd6ae8b7 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
+                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_form_button_active_flow"/>
+                    <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"/>
                     <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">
@@ -114,11 +114,11 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
+                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_form_button_active_flow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <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"/>
                     <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 a8bb5ea83c8..d7009848f2a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -258,10 +258,10 @@
             <field name="arch" type="xml">
                 <form string="Payslip" version="7.0">
                 <header>
-                    <button string="Confirm" name="hr_verify_sheet" states="draft"/>
-                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
+                    <button string="Confirm" name="hr_verify_sheet" states="draft" class="oe_form_button_active_flow"/>
+                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object' class="oe_form_button_return_flow"/>
                     <button string="Set to Draft" name="draft" states="cancel"/>
-                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
+                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft" class="oe_form_button_active_flow"/>
                     <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
@@ -721,9 +721,9 @@
             <field name="arch" type="xml">
                 <form string="Payslips Batches" version="7.0">
                 <header>
-                    <button name="close_payslip_run" type="object" string="Close" states="draft"/>
-                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
-                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
+                    <button name="close_payslip_run" type="object" string="Close" states="draft" class="oe_form_button_active_flow"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" class="oe_form_button_active_flow"/>
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close" class="oe_form_button_return_flow"/>
                     <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 75a74c88139..34cb7af6948 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -73,15 +73,15 @@
             <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
-                        states="open,pending"/>
+                        states="open,pending" class="oe_form_button_active_flow"/>
                 <button name="case_open" string="Open" type="object"
-                        states="draft,pending"/>
+                        states="draft,pending" class="oe_form_button_active_flow"/>
                 <button name="case_pending" string="Pending" type="object"
                         states="open"/>
                 <button name="case_reset" string="Reset to New" type="object"
-                        states="done,cancel"/>
+                        states="done,cancel" class="oe_form_button_return_flow"/>
                 <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending"/>
+                        states="draft,open,pending" class="oe_form_button_active_flow"/>
                 <button name="stage_previous" string="Previous" type="object"
                         states="open" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" type="object"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cb658f46704..1bfee9f0442 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -64,10 +64,10 @@
             <field name="arch" type="xml">
                 <form string="Timesheet" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
-                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
-                    <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"/>
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_form_button_active_flow"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_form_button_active_flow"/>
+                    <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"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
                 <sheet>