diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 83f5681f311..14a9761e102 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -43,7 +43,7 @@ Thanks,
         </record>
 
         <record id="filter_draft_lead" model="ir.filters">
-            <field name="name">Filter on leads which are draft.</field>
+            <field name="name">Draft Leads</field>
             <field name="model_id">crm.lead</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="user_id" eval="False"/>
@@ -62,7 +62,7 @@ Thanks,
         </record>
 
         <record id="filter_usa_lead" model="ir.filters">
-            <field name="name">Filter on leads which come from USA.</field>
+            <field name="name">Leads from USA</field>
             <field name="model_id">crm.lead</field>
             <field name="domain">[('country_id','=','United States')]</field>
             <field name="user_id" eval="False"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 93abc967b8e..00a071fa954 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -15,20 +15,6 @@
                 </field>
         </record>
 
-        <record id="view_partners_form_crm3" model="ir.ui.view">
-                <field name="name">view.res.partner.search.crm.inherited3</field>
-                <field name="model">res.partner</field>
-                <field name="inherit_id" ref="base.view_res_partner_filter"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <xpath expr="//group[@string='Group By...']" position="after">
-                        <group string="Display">
-                            <filter string="Show Sales Team" context="{'invisible_section': False}"/>
-                        </group>
-                    </xpath>
-                </field>
-        </record>
-
         <!-- open meetings related to given partner -->
         <record id="crm_meeting_partner" model="ir.actions.act_window">
             <field name="name">Meetings</field>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 087eb433bca..5abfcabbc71 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -2,12 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
-            groups="base.group_sale_salesman"
-            sequence="40"/>
-
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
             parent="base.menu_base_partner" sequence="2" />
@@ -50,8 +44,6 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Stages" action="crm_claim_stage_act" parent="menu_config_claim" sequence="20"/>
 
     </data>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 91c51e87ad9..8623765199b 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -11,9 +11,9 @@
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
                     <xpath expr="//footer" position="replace">
-                    <footer>
-                        <button string="Close" special="Cancel" class="oe_highlight"/>
-                    </footer>
+                       <footer>
+                            <button string="Close" class="oe_link" special="cancel" />
+                       </footer>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 3774a369437..31fa27a644f 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,9 +11,9 @@
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
                     <xpath expr="//footer" position="replace">
-                    <footer>
-                        <button string="Close" special="Cancel" class="oe_highlight"/>
-                    </footer>
+                       <footer>
+                            <button string="Close" class="oe_link" special="cancel" />
+                       </footer>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>