diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 5336f52a000..7101473589b 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -12,7 +12,7 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Luc Latour'" name="partner_name"/>
-            <field eval="'open'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(726) 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -21,13 +21,14 @@
             <field eval="'The Oil Company'" name="name"/>
             <field eval="'(769) 703-274'" name="phone"/>
         </record>
+
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead7"/>
             <field eval="'4'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Marc Dufour'" name="partner_name"/>
-            <field eval="'open'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -36,13 +37,14 @@
             <field eval="'Le Club SARL'" name="name"/>
             <field eval="'(956) 293-2595'" name="phone"/>
         </record>
+        
         <record id="crm_case_developingwebapplications0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead5"/>
             <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Fabien Pinckaers'" name="partner_name"/>
-            <field eval="'done'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -67,13 +69,14 @@
             <field eval="'The Gas Company'" name="name"/>
             <field eval="'(514) 698-4118'" name="phone"/>
         </record>
+
         <record id="crm_case_itdeveloper0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead4"/>
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Carrie Helle'" name="partner_name"/>
-            <field eval="'pending'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -82,6 +85,7 @@
             <field eval="'Stonage IT'" name="name"/>
             <field eval="'(855) 924-4364'" name="phone"/>
         </record>
+        
         <record id="crm_case_mgroperations0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
@@ -91,7 +95,7 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Tina Pinero'" name="partner_name"/>
-            <field eval="'cancel'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
@@ -107,7 +111,7 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Wendi Baltz'" name="partner_name"/>
-            <field eval="'done'" name="state"/>
+            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
@@ -115,5 +119,107 @@
             <field eval="'Gardner Group'" name="name"/>
             <field eval="'(282) 603-7489'" name="phone"/>
         </record>
+        <record id="crm_case_webvisitor0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead5"/>
+            <field eval="&quot;1&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Questionnaire&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Smith John&quot;" name="partner_name2"/>
+            <field eval="&quot;(487) 013-1504&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
+            <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
+            <field eval="time.strftime('%Y-%m-16 10:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_business_card0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;Marketing Products&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Elvis Borne&quot;" name="partner_name2"/>
+            <field eval="&quot;(147) 014-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor5"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Business Card&quot;" name="partner_name"/>
+            <field eval="&quot;(124) 587-8974&quot;" name="partner_phone"/>
+            <field eval="time.strftime('%Y-%m-16 11:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_imported_contact0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead8"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Business Group&quot;" name="name"/>
+            <field eval="&quot;cancel&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Drew Clark&quot;" name="partner_name2"/>
+            <field eval="&quot;(125) 021-4781&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="&quot;Imported Contact&quot;" name="partner_name"/>
+        </record>
+        <record id="crm_case_employee0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;OpenERP Campaining&quot;" name="name"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Carl Nelson&quot;" name="partner_name2"/>
+            <field eval="&quot;(874) 022-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="&quot;Campaining&quot;" name="partner_name"/>
+            <field eval="&quot;(232) 147-6329&quot;" name="partner_phone"/>
+        </record>
+        <record id="crm_case_company_partnership0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Offer&quot;" name="name"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Joe Lucas&quot;" name="partner_name2"/>
+            <field eval="&quot;(234) 031-1254&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Partnership Offer&quot;" name="partner_name"/>
+            <field eval="&quot;(254) 954-2147&quot;" name="partner_phone"/>
+       </record>
+
+       
+       <!--        Call Function to Open the leads-->
+        <function model="crm.lead" name="case_open">
+            <value eval="[ref('crm_case_itisatelesalescampaign0'), ref('crm_case_electonicgoodsdealer0'), ref('crm_case_company_partnership0'), ref('crm_case_webvisitor0'), ref('crm_case_business_card0')]"/>
+        </function>
+        
+        <!--        Call Function to mark the lead as Pending-->
+        <function model="crm.lead" name="case_pending">
+            <value eval="[ref('crm_case_itdeveloper0')]"/>
+        </function>
+
+        <!--        Call Function to Close the leads-->
+        <function model="crm.lead" name="case_close">
+            <value eval="[ref('crm_case_vpoperations0'), ref('crm_case_developingwebapplications0'), ref('crm_case_webvisitor0')]"/>
+        </function>
+    
+        <!--        Call Function to Cancel the leads-->
+        <function model="crm.lead" name="case_cancel">
+            <value eval="[ref('crm_case_mgroperations0'), ref('crm_case_imported_contact0')]"/>
+        </function>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 379644e72b1..bb0b281820a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -182,7 +182,7 @@
                             string="Reply to Last Email"
                             name="%(crm.action_crm_send_mail)d"
                             context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                            icon="gtk-undo" type="action" />
+                            icon="terp-mail-replied" type="action" />
                         </form>
                         <tree string="Communication history">
                             <field name="date"/>
@@ -194,10 +194,10 @@
                     <button colspan="2" string="Send New Email"
                         name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="gtk-go-forward" type="action" />
+                        icon="terp-mail-message-new" type="action" />
                     <button colspan="2" string="Forward to Partner"
                         name="%(crm_lead_forward_to_partner_act)d"
-                        icon="gtk-go-forward" type="action" />
+                        icon="terp-mail-forward" type="action" />
                  </page>
 
                 </notebook>
@@ -280,23 +280,23 @@
         <field name="arch" type="xml">
             <search string="Search Leads">
                 <filter icon="terp-check"
-                    string="Current"
+                    string="Current" help="Current Leads"
                     default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-camera_test"
-                    string="Open"
+                    string="Open" help="Open Leads"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
-                    string="Pending"
+                    string="Pending" help="Pending Leads"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
                 <filter icon="terp-go-today" string="Today"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
                             ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                    help="Todays' Opportunities" />
+                    help="Today's Leads" />
                 <filter icon="terp-go-week" string="7 Days"
-                    help="Opportunities during last 7 days"
+                    help="Leads during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
                      ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
@@ -338,9 +338,9 @@
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Source" help="Lead's Source" icon="terp-purchase" domain="[]" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 7e0042f8944..b917253bf85 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -182,7 +182,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -194,10 +194,10 @@
                             <button colspan="2" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                             <button colspan="2" string="Forward to Partner"
                                 name="%(crm_lead_forward_to_partner_act)d"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-forward" type="action" />
                         </page>
                         <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index e8a60cea01f..f00819a0398 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -29,7 +29,7 @@
                     <separator string="" colspan="4" />
                     <group colspan="4" col="2">
                         <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
-                        <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
+                        <button name="action_forward" string="Forward" icon="terp-mail-forward" type="object" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 48cc9055c58..b72f7a769c0 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -207,7 +207,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'crm.lead'}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -219,7 +219,7 @@
                    <button colspan="4" string="Send New Email"
                        name="%(crm.action_crm_send_mail)d"
                        context="{'mail':'new', 'model': 'crm.claim'}"
-                       icon="gtk-go-forward" type="action" />
+                       icon="terp-mail-message-new" type="action" />
                  </page>
                 </notebook>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68705d73d8e..961b7f4cfa6 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -212,7 +212,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -224,7 +224,7 @@
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.fundraising'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index c077c219162..5e018a676cf 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -151,7 +151,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -163,7 +163,7 @@
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9956010fcb6..5091dd3337b 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -177,7 +177,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -189,7 +189,7 @@
                            <button colspan="4" string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'hr.applicant'}"
-                               icon="gtk-go-forward" type="action" />
+                               icon="terp-mail-message-new" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fd523ad7774..ea3f41840c2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -96,7 +96,7 @@
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="date"/>
@@ -108,7 +108,7 @@
                            <button colspan="4" string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="gtk-go-forward" type="action" />
+                               icon="terp-mail-message-new" type="action" />
                         </page>
                            <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">