diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 44c97c1e77d..debb84e0c7c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -25,8 +25,7 @@
                 <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_close" string="Close" type="object" states="open" class="oe_form_button_active_flow"/>
-                        <button name="set_close" string="Close" type="object" states="pending" 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"/>
                         <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb875b9dc60..a65db02d0d6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,12 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <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_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}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <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"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -326,15 +327,15 @@
                 <form string="Project" version="7.0">
                     <header>
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending"/>
+                                states="draft,pending" class="oe_form_button_active_flow"/>
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
+                                states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
+                                states="open" class="oe_form_button_active_flow"/>
                         <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
+                                states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
+                                states="cancel,done" class="oe_form_button_return_flow"/>
                         <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 b7089cac129..121433ec5d1 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -55,15 +55,15 @@
                 <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
-                            states="draft,pending"/>
+                            states="draft,pending" class="oe_form_button_active_flow"/>
                     <button name="case_close" string="Done" type="object"
-                            states="draft,open,pending"/>
+                            states="draft,open,pending" class="oe_form_button_active_flow"/>
                     <button name="case_pending" string="Pending" type="object"
-                            states="draft,open"/>
+                            states="draft,open" class="oe_form_button_return_flow"/>
                     <button name="case_escalate" string="Escalate" type="object"
-                            states="draft,open,pending"/>
+                            states="draft,open,pending" class="oe_form_button_return_flow"/>
                     <button name="case_reset" string="Reset to New" type="object"
-                            states="cancelled,done"/>
+                            states="cancelled,done" class="oe_form_button_return_flow"/>
                     <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 1717fb950f7..87ca1a9f6c8 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,9 +143,9 @@
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft"/>
-                    <button string="Done" name="set_done" states="pending,open"/>
-                    <button string="Pending" name="set_pending" states="open"/>
+                    <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="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>