diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index f233d0e905b..bd9101a3382 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -45,10 +45,10 @@
         <field name="arch" type="xml">
             <search string="Accounts Analysis">
                <group>
-               <filter icon="terp-account"
+               <filter icon="terp-go-today"
 	                    	string="At Date"
 	                    	domain="[('currency_mode','=', 'current')]"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-stock_format-default"
 	                    	string="Average Rate"
 	                    	domain="[('currency_mode','=','average')]"/>
 	            <separator orientation="vertical"/>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 8344abf4628..1564859540a 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -50,7 +50,7 @@
 	                <separator orientation="vertical"/>
 	                <field name="product_id" />
 	                <field name="user_id" widget="selection">
-	                <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/>
+	                <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
 	                </field>
 	            </group>
                 <newline/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fc5140c8303..d0c1a57ba84 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -95,10 +95,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <filter icon="gtk-apply" string="Accepted"
+                   <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
-                   <filter icon="gtk-close" string="Declined"
+                   <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
@@ -108,19 +108,19 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-				    <group expand="1" string="Group By...">
-						<filter string="Type" icon="terp-project" help="Invitation Type"
+				    <group expand="0" string="Group By...">
+						<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
 					        domain="[]" context="{'group_by':'cutype'}" />
-					    <filter string="Role" icon="terp-project"
+					    <filter string="Role" icon="terp-gtk-select-all"
 					        domain="[]" context="{'group_by':'role'}" />
-					    <filter string="Required Reply" icon="terp-crm"
+					    <filter string="Required Reply" icon="terp-mail-replied"
 					        domain="[]" context="{'group_by':'rsvp'}" />
 					    <separator orientation="vertical" />
-					    <filter string="User" icon="terp-partner" domain="[]"
+					    <filter string="User" icon="terp-personal" domain="[]"
 					        context="{'group_by':'user_id'}" />
-					    <filter string="Contact" icon="terp-partner" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />						
-					    <filter string="State" icon="terp-project" help="Invitation Type"
+					    <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
+					        context="{'group_by':'partner_address_id'}" />
+					    <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':' state'}" />
 					</group>
                </search>
@@ -383,7 +383,7 @@
 	        <field name="arch" type="xml">
                 <search string="Search Events">
                        <group col="12" colspan="4">
-                           <filter icon="terp-partner" string="My Events"
+                           <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
                            <separator orientation="vertical"/>
@@ -396,15 +396,15 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+						<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Availability" icon="terp-project"
+						    <filter string="Availability" icon="terp-camera_test"
 						        domain="[]" context="{'group_by':'show_as'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
 						</group>
                 </search>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dbfbeedf0a8..465c63ae626 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -50,7 +50,7 @@
                          name="convert_opportunity"
                          string="Convert"
                          help="Convert to Opportunity"
-                         icon="gtk-index"   
+                         icon="gtk-index"
                          type="object"/>
                     <newline />
                     <field name="section_id" colspan="1"
@@ -273,23 +273,23 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-check"
                     string="Current"
                     default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-camera_test"
                     string="Open"
                     domain="[('state','=','open')]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-gtk-media-pause"
                     string="Pending"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="gtk-home" string="Today"
+                <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" />
-                <filter icon="gtk-media-rewind" string="7 Days"
+                <filter icon="terp-go-week" string="7 Days"
                     help="Opportunities 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'))]"
@@ -298,32 +298,32 @@
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
                         help="My Sale Team"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
+                <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'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
+                    <filter string="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"/>
-                    <filter string="Creation" icon="terp-project"
+                    <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e2decc30340..cd3b7866a89 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -263,32 +263,32 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-project" name="current" string="Current"
+                           <filter icon="terp-check" name="current" string="Current"
                                 domain="[('state','in',('draft', 'open'))]"
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
-                               <filter icon="terp-crm"
+                               <filter icon="terp-personal+"
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My Sale Team" />
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-					   	<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+					   	<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
-						    <filter string="Partner" icon="terp-partner" domain="[]"
+						    <filter string="Partner" icon="terp-personal" domain="[]"
 						        context="{'group_by':'partner_id'}" />
 						    <separator orientation="vertical" />
-						    <filter string="State" icon="terp-crm" domain="[]"
+						    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
 						        context="{'group_by':'state'}" />
 						    <separator orientation="vertical" />
 						</group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 407c3c53cf4..eadc4158d69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -275,21 +275,21 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Opportunities">
-                        <filter icon="terp-project"
+                        <filter icon="terp-check"
                             string="Current"
                             name="current"
                             domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-project"
+                        <filter icon="terp-camera_test"
                             string="Open"
                             domain="[('state','=','open')]"/>
-                        <filter icon="terp-project"
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="gtk-home" string="Today"
+                        <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" />
-                        <filter icon="gtk-media-rewind" string="7 Days"
+                        <filter icon="terp-go-week" string="7 Days"
                             help="Opportunities 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'))]"
@@ -297,33 +297,33 @@
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
                         <field name="user_id" widget="selection">
-                            <filter icon="terp-partner"
+                            <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
                         </field>
                         <field name="section_id"
                             default="context.get('section_id', False)" select="1"
                             widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 domain="[('section_id','=',context.get('section_id',False))]"
                                 help="My Sale Team" />
                         </field>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">
-                            <filter string="Stage" icon="terp-crm" domain="[]"
+                            <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
-                            <filter string="Priority" icon="terp-crm" domain="[]"
+                            <filter string="Priority" icon="terp-rating-rated" domain="[]"
                                 context="{'group_by':'priority'}" />
-                            <filter string="Category" icon="terp-crm"
+                            <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
 
                             <separator orientation="vertical" />
-                            <filter string="Salesman" icon="terp-crm"
+                            <filter string="Salesman" icon="terp-personal"
                                 domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="Creation" icon="terp-project"
+                            <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
-                            <filter string="Exp.Closing" icon="terp-project"
+                            <filter string="Exp.Closing" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date_deadline'}" />
                         </group>
                     </search>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c5813a38b09..db8adda789c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -136,7 +136,7 @@
             </form>
         </field>
     </record>
-	
+
 	<!--Inbound Phonecalls Form View -->
 
 	<record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
@@ -196,9 +196,9 @@
             </form>
         </field>
     </record>
-    
+
     <!--Inbound Phonecalls Tree View -->
-    
+
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
         <field name="name">CRM - Inbound Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
@@ -247,12 +247,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="gtk-home" string="Today"
+               <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
                    help="Todays's Phonecalls"
                />
-               <filter icon="gtk-media-rewind"
+               <filter icon="terp-go-week"
                    string="7 Days"
                    help="Phonecalls during last 7 days"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')),\
@@ -262,31 +262,31 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner"
+                   <filter icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
-                   <filter icon="terp-crm"
+                   <filter icon="terp-personal+"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My Sale Team" />
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-crm" domain="[]"
+                   <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-crm"
+                   <filter string="Responsible" icon="terp-personal"
                        domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-project"
+                   <filter string="Creation" icon="terp-go-month"
                        domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-project" domain="[]"
+                   <filter string="Date" icon="terp-go-month" domain="[]"
                        context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
     </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 2992959bdd0..ee5a6ac35f4 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -70,10 +70,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
                    <group col="10" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
@@ -162,10 +162,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group col="8" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -237,10 +237,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Section, Category and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -330,10 +330,10 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by User for this month" />
                            <separator orientation="vertical"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index af5c5aeb7a6..f6ac9238b3c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -76,17 +76,17 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="16" colspan="8">
-                   	    <filter string="Last 365 Days" icon="gtk-media-rewind"
+                   	    <filter string="Last 365 Days" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="gtk-media-rewind" name="This Month"
+                        <filter string="Last 30 Days" icon="terp-go-month" name="This Month"
                     	    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                        <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
                    		<separator orientation="vertical" />
-                        <filter icon="terp-crm"
+                        <filter icon="terp-check"
                     		string="Current"
                     		domain="[('state','in',('draft','open')]"/>
-					    <filter icon="terp-crm"
+					    <filter icon="terp-check"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                    		<separator orientation="vertical" />
@@ -100,16 +100,16 @@
                    			help="My section" />
                    		</field>
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-crm"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                         	domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
@@ -122,15 +122,15 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-crm"
+                        <filter string="Company" icon="terp-go-home"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-crm"
+                        <filter string="Day" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-crm"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-crm"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 6202b0ab3ad..ddc50460e31 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -77,25 +77,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-check"
                     		string="Current"
                     		domain="[('state','in',('draft','oprn'))]"/>
-                   <filter icon="terp-hr"
+                        <filter icon="terp-hr"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
-                     <filter icon="terp-sale"
+                        <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
@@ -104,7 +104,7 @@
                           context="{'group_by':'stage_id'}" />
 
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
@@ -114,8 +114,8 @@
                			</field>
                    </group>
                     <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
@@ -132,15 +132,15 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b3f883024c..61cf7c6368d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -258,16 +258,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current" name="current"
+                   <filter icon="terp-check" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims" default="1"
                    />
-                   <filter icon="gtk-execute"
+                   <filter icon="terp-camera_test"
                        string="In Progress"
                        domain="[('state','=','open')]"
                        separator="1" help="In Progress Claims"
                    />
-                   <filter icon="gtk-media-pause"
+                   <filter icon="terp-gtk-media-pause"
                        string="Pending"
                        domain="[('state','=','pending')]"
                        separator="1" help="All pending Claims"
@@ -276,18 +276,18 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
+                           <filter icon="terp-personal-"
                                domain="[('user_id','=', False)]"
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                       <filter string="Deadline" icon="terp-crm"
+                   <group expand="0" string="Group By...">
+                       <filter string="Deadline" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-crm"
+                       <filter string="Closure" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_closed'}" />
                    </group>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index ca6fdb95277..7892039436c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -77,25 +77,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -105,69 +105,69 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Stage" icon="terp-sale" domain="[]"
+                        <filter string="Stage" icon="terp-stage" domain="[]"
                              context="{'group_by':'stage_id'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
-                         <filter string="Priority" icon="terp-sale" domain="[]"
+                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                              context="{'group_by':'priority'}" />
-                         <filter string="Type" icon="terp-sale" domain="[]"
+                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                              context="{'group_by':'type_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6853da7c89a..9ef1c936be4 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -269,13 +269,13 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
-                            <filter icon="gtk-new" string="Current"
+                            <filter icon="terp-check" string="Current"
                                 domain="[('state','in',('draft', 'open'))]" name="current"
                                 help="Current Funds" />
-                            <filter icon="gtk-yes" string="Open"
+                            <filter icon="terp-camera_test" string="Open"
                                 domain="[('state','=','open')]"
                                 help="Open Funds" />
-                            <filter icon="gtk-media-pause"
+                            <filter icon="terp-gtk-media-pause"
                                 string="Pending"
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
@@ -285,26 +285,26 @@
                                 string="Fund Description" />
                             <field name="user_id" select="1"
                                 widget="selection">
-                                <filter icon="terp-partner"
+                                <filter icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
-                                <filter icon="terp-crm"
+                                <filter icon="terp-personal+"
                                     domain="[('section_id','=',context.get('section_id',False))]"
                                     help="My section" />
                             </field>
                         </group>
                         <newline/>
-                        <group expand="1" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
+                        <group expand="0" string="Group By...">
+                            <filter string="Partner" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-crm"
+                            <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="Type" icon="terp-project"
+                            <filter string="Type" icon="terp-stock_symbol-selection"
                                 domain="[]"
                                 context="{'group_by':'type_id'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 20e8ef68b6b..6e27fc8390d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -76,25 +76,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -104,60 +104,61 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 451f6c7119e..57e7bba0199 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -234,12 +234,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
-                    <filter icon="gtk-home" string="Today"
+                    <filter icon="terp-go-today" string="Today"
                         separator="1"
                         domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                         help="Todays's Helpdesk Requests"
                         />
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                         string="7 Days" separator="1"
                         help="Helpdesk requests during last 7 days"
                         domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -249,17 +249,17 @@
                     <field name="partner_id" />
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
-                        <filter icon="terp-crm"
+                        <filter icon="terp-personal+"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             help="My section" />
                     </field>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Customer" icon="terp-crm"
+                    <group expand="0" string="Group By...">
+                        <filter string="Customer" icon="terp-personal"
                             domain="[]" context="{'group_by':'partner_id'}" />
-                        <filter string="State" icon="terp-crm" domain="[]"
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
-                        <filter string="Priority" icon="terp-crm"
+                        <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
                     </group>
                 </search>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index f564bb38d4d..c6875e21a4a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -71,25 +71,25 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('name','=',time.localtime()[0])]"
                    			default="1" />
 
-                   		<filter string="This Month" icon="terp-hr"
+                   		<filter string="This Month" icon="terp-go-month"
                    			domain="[('month','=',time.strftime('%%m'))]"
                    			default="1" />
 
                    		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-hr"
+                   		<filter string="Current" icon="terp-check"
                    			domain="[('state','in',('open','draft'))]" />
 
-                   		<filter string="Won" icon="terp-hr"
+                   		<filter string="Won" icon="terp-check"
                    			domain="[('state','=','done')]" />
 
-                   		<filter string="Lost" icon="terp-hr"
+                   		<filter string="Lost" icon="terp-dialog-close"
                    			domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-hr"
+                   		<filter string="Deadline" icon="terp-go-month"
                    			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
 
                    		<separator orientation="vertical" />
@@ -98,14 +98,14 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
@@ -114,59 +114,41 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                  <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-sale"
+                  <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Partner" icon="terp-sale"
+                        <filter string="Partner" icon="terp-personal"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                     <newline/>
                    <group expand="0" string="Extended options..."  groups="base.group_extended">
-                        <filter icon="terp-sale"
-                            string="Lowest"
-                            domain="[('priority','=','5')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Low"
-                            domain="[('priority','=','4')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Normal"
-                            domain="[('priority','=','3')]"/>
-
-                        <filter icon="terp-sale"
-                            string="High"
-                            domain="[('priority','=','2')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Highest"
-                            domain="[('priority','=','1')]"/>
-
+                        <filter string="Priority" icon="terp-rating-rated"
+                            domain="[]" context="{'group_by':'priority'}" />
                    </group>
-                   
+
 
                </search>
             </field>
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index e6ff86d1087..36852db16df 100755
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -129,14 +129,14 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Mailboxes">
-                    <filter icon="terp-crm" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
-                    <filter icon="terp-crm" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
+                    <filter icon="terp-mail-message-new" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
+                    <filter icon="terp-accessories-archiver" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-crm" string="Sent" domain="[('folder','=','sent')]"/>
-                    <filter icon="terp-crm" string="Trash" domain="[('folder','=','trash')]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sent" domain="[('folder','=','sent')]"/>
+                    <filter icon="terp-accessories-archiver-minus" string="Trash" domain="[('folder','=','trash')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-crm" string="Not Applicable" domain="[('state','=','na')]"/>
-                    <filter icon="terp-crm" string="Sending" domain="[('state','=','sending')]"/>
+                    <filter icon="terp-gtk-stop" string="Not Applicable" domain="[('state','=','na')]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sending" domain="[('state','=','sending')]"/>
                     <separator orientation="vertical"/>
                     <field name="email_from" select="1"/>
                     <field name="email_to" select="1"/>