diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2a3c618179b..495b1862932 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -364,7 +364,9 @@
             <form string="Opportunities" version="7.0">
                 <header>
                     <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,open,pending"/>
+                            states="open" class="oe_form_button_active_flow"/>
+                    <button name="case_mark_won" string="Mark Won" type="object"
+                            states="draft,pending"/>
                     <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"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index deade91541d..cde9210b840 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -34,12 +34,16 @@
                             states="draft,pending"/>
                     <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"
+                            states="draft"/>
                     <button name="case_pending" string="Pending" type="object" class="oe_form_button_return_flow"
-                            states="draft,open"/>
+                            states="open"/>
                     <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"
-                            states="open,draft,pending"/>
+                            states="open"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>