diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 86a891aae45..2a3c618179b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -63,8 +63,8 @@
             <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            states="draft,open,pending" help="Convert to Opportunity"/>
-                    <button name="case_escalate" string="Escalate" type="object"
+                            states="draft,open,pending" help="Convert to Opportunity" class="oe_form_button_active_flow"/>
+                    <button name="case_escalate" string="Escalate" type="object"  class="oe_form_button_return_flow"
                             states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
@@ -365,19 +365,19 @@
                 <header>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
-                    <button name="case_open" string="Open" type="object"
+                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
                             states="draft,pending"/>
                     <button name="case_escalate" string="Escalate" type="object"
-                            states="open"/>
+                            states="open" class="oe_form_button_return_flow"/>
                     <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"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft"/>
-                    <button name="stage_previous" string="Previous" type="object"
+                    <button name="stage_previous" string="Previous" type="object" class="oe_form_button_active_flow"
                             states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
+                    <button name="stage_next" string="Next" type="object"  class="oe_form_button_active_flow"
                             states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e98ce2ce8f6..5c715f14051 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -27,9 +27,9 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <button name="case_open" string="Confirm" type="object"
+                    <button name="case_open" string="Confirm" type="object" class="oe_form_button_active_flow"
                             states="draft"/>
-                    <button name="case_close" string="Done" type="object"
+                    <button name="case_close" string="Done" type="object" class="oe_form_button_active_flow"
                             states="open"/>
                     <button name="case_reset" string="Reset to Unconfirmed" type="object"
                             states="cancel,done"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b5c75aa6ccf..6d12e1d0554 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -64,9 +64,9 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="case_open" string="Confirm" type="object"
+                <button name="case_open" string="Confirm" type="object" class="oe_form_button_active_flow"
                         states="draft,pending" icon="gtk-go-forward"/>
-                <button name="case_close" string="Held" type="object"
+                <button name="case_close" string="Held" type="object" class="oe_form_button_active_flow"
                         states="open,pending" icon="gtk-jump-to"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel" icon="gtk-convert"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6477234ce05..beb7fab9021 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -90,11 +90,11 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object"
-                            states="draft,pending"/>
-                    <button name="case_close" string="Done" type="object"
+                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
+                            states="draft,pending" />
+                    <button name="case_close" string="Done" type="object" class="oe_form_button_active_flow"
                             states="open,pending"/>
-                    <button name="case_refuse" string="Refuse" type="object"
+                    <button name="case_refuse" string="Refuse" type="object" class="oe_form_button_active_flow"
                             states="draft,open,pending"/>
                     <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/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 1239dff85ff..deade91541d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,15 +30,15 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object"
+                    <button name="case_open" string="Open" type="object" class="oe_form_button_active_flow"
                             states="draft,pending"/>
-                    <button name="case_close" string="Close" type="object"
+                    <button name="case_close" string="Close" type="object" class="oe_form_button_active_flow"
                             states="open,draft,pending"/>
-                    <button name="case_pending" string="Pending" type="object"
+                    <button name="case_pending" string="Pending" type="object" class="oe_form_button_return_flow"
                             states="draft,open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object"
+                    <button name="case_reset" string="Reset to Draft" type="object" 
                             states="cancel,done"/>
-                    <button name="case_escalate" string="Escalate" type="object"
+                    <button name="case_escalate" string="Escalate" type="object" class="oe_form_button_return_flow"
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>