diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 86cd5cdf935..4dbe1405c4d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -60,10 +60,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(crm.action_crm_lead2opportunity_partner)d" type="action"
-                            string="Convert to Opportunity" help="Convert to Opportunity" icon="gtk-go-forward"/>
+                    <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
+                            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" icon="gtk-cancel"/>
+                            states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="stage_id" nolabel="1" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
@@ -178,19 +180,12 @@
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="subjects" invisible="1"/>
-                    <button name="case_open" string="Open"
-                        states="draft,pending" type="object"
-                        icon="gtk-go-forward" groups="base.group_no_one"/>
-                    <button name="case_close" string="Close"
-                        states="open,draft,pending" type="object"
-                        icon="gtk-close" groups="base.group_no_one"/>
-                    <button name="%(crm.action_crm_lead2opportunity_partner)d"
-                        string="Convert to Opportunity"
-                        states="draft,open,pending" icon="gtk-index"
-                        type="action" />
-                    <button name="case_escalate" string="Escalate"
-                        states="open,draft,pending" type="object"
-                        icon="gtk-go-up" />
+                    <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
+                            states="draft,open,pending" icon="gtk-go-forward"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="draft,open,pending" icon="gtk-go-up"/>
+                    <button name="case_cancel" string="Dead" type="object"
+                            states="open,draft,pending" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -373,6 +368,10 @@
     </record>
 
 
+    <!--
+        OPPORTUNITY
+        -->
+
     <!-- Opportunities Form View -->
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">Opportunities</field>
@@ -514,41 +513,41 @@
         </field>
     </record>
 
-    <!-- Opportunities Tree View -->
-    <record model="ir.ui.view" id="crm_case_tree_view_oppor">
-        <field name="name">Opportunities Tree</field>
-        <field name="model">crm.lead</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                <field name="needaction_pending" invisible="1"/>
-                <field name="date_deadline" invisible="1"/>
-                <field name="create_date" groups="base.group_no_one"/>
-                <field name="name" string="Opportunity"/>
-                <field name="partner_id" string="Customer"/>
-                <field name="country_id" invisible="context.get('invisible_country', True)" />
-                <field name="date_action"/>
-                <field name="title_action" />
-                <field name="channel_id" invisible="1"/>
-                <field name="type_id" invisible="1"/>
-                <field name="subjects" invisible="1"/>
-                <field name="stage_id"/>
-                <button name="stage_previous" string="Previous Stage" states="open,pending" type="object" icon="gtk-go-back" />
-                <button name="stage_next" string="Next Stage" states="open,pending" type="object" icon="gtk-go-forward" />
-                <field name="planned_revenue" sum="Expected Revenues"/>
-                <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="section_id" invisible="context.get('invisible_section', True)" />
-                <field name="user_id"/>
-                <field name="priority" invisible="1"/>
-                <field name="categ_id" invisible="1"/>
-                <field name="state" groups="base.group_no_one"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" groups="base.group_no_one"/>
-                <button name="case_pending" string="Pending" states="open,draft" type="object" icon="gtk-media-pause" groups="base.group_no_one"/>
-                <button name="case_mark_lost" string="Lost" states="open,pending" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
-                <button name="case_mark_won" string="Won" states="open,pending" type="object" icon="gtk-apply" groups="base.group_no_one"/>
-            </tree>
-        </field>
-    </record>
+        <!-- Opportunities Tree View -->
+        <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+            <field name="name">Opportunities Tree</field>
+            <field name="model">crm.lead</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                    <field name="needaction_pending" invisible="1"/>
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="create_date" groups="base.group_no_one"/>
+                    <field name="name" string="Opportunity"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="date_action"/>
+                    <field name="title_action" />
+                    <field name="channel_id" invisible="1"/>
+                    <field name="type_id" invisible="1"/>
+                    <field name="subjects" invisible="1"/>
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" sum="Expected Revenues"/>
+                    <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="user_id"/>
+                    <field name="priority" invisible="1"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="state" groups="base.group_no_one"/>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft,pending" icon="gtk-go-forward"/>
+                    <button name="case_mark_won" string="Won" type="object"
+                            states="open,pending" icon="gtk-apply"/>
+                    <button name="case_mark_lost" string="Lost" type="object"
+                            states="open,pending" icon="gtk-cancel"/>
+                </tree>
+            </field>
+        </record>
 
 
     <!-- Opportunities Search View -->
@@ -609,19 +608,19 @@
         </field>
     </record>
 
-    <!-- crm.lead Opportunities Graph View -->
-    <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
-        <field name="name">CRM - Opportunity Graph</field>
-        <field name="model">crm.lead</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                <field name="categ_id"/>
-                <field name="planned_revenue" operator="+"/>
-                <field name="state" group="True"/>
-            </graph>
-        </field>
-    </record>
+        <!-- crm.lead Opportunities Graph View -->
+        <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+            <field name="name">CRM - Opportunity Graph</field>
+            <field name="model">crm.lead</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                    <field name="state" group="True"/>
+                </graph>
+            </field>
+        </record>
 
-</data>
+    </data>
 </openerp>