diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 15edf654745..5571bcd7d8b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -63,11 +63,13 @@
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            help="Convert to Opportunity"/>
+                            states="draft,open,pending" help="Convert to Opportunity"/>
                     <button name="case_escalate" string="Escalate" type="object"
                             states="draft,open,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
+                    <button name="case_reset" string="Reset" type="object"
+                            states="cancel"/>
                     <div class="oe_right">
                         <field name="stage_id" nolabel="1" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
@@ -383,22 +385,22 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
                     <button name="stage_next" string="Next" type="object"
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
+                            states="open" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_open" string="Open" type="object"
-                            states="draft" icon="gtk-go-forward"/>
+                            states="draft"/>
                     <button name="case_escalate" string="Escalate" type="object"
-                            states="open" icon="gtk-go-up"/>
+                            states="open"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
-                            states="open" icon="gtk-apply"/>
+                            states="open"/>
                     <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="open" icon="gtk-cancel"/>
+                            states="open"/>
                     <button name="case_reset" string="Reset to Draft" type="object"
-                            states="cancel,done" icon="gtk-convert"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft" icon="gtk-cancel"/>
+                            states="cancel"/>
+                    <button name="case_cancel" string="Mark Lost" type="object"
+                            states="draft"/>
                     <div class="oe_right">
                         <field name="stage_id" nolabel="1" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>