diff --git a/addons/account/account.py b/addons/account/account.py
index 04a0bb5da68..61319f7f973 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1965,13 +1965,12 @@ class account_add_tmpl_wizard(osv.osv_memory):
         if not tids or not tids[0]['parent_id']:
             return False
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
+        res = None
         if not ptids or not ptids[0]['code']:
             raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
             res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
-        if res:
-            return res[0]
-        else:
-            return False
+
+        return res and res[0] or False
 
     _columns = {
         'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 31872e27ef4..dbfbeedf0a8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -12,9 +12,11 @@
         <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
-    <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
-        groups="base.group_extended"
-        parent="crm.menu_crm_case_stage" />
+
+     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
+        groups="base.group_extended" sequence="0"
+        parent="menu_crm_config_lead" />
+
 
     	<!--  Resource Type Form View -->
 
@@ -26,10 +28,11 @@
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="context">{'object_id':'crm.lead'}</field>
         </record>
-        <menuitem action="crm_lead_resource_act"
-            id="menu_crm_lead_resource_act"
-            groups="base.group_extended"
-            parent="crm.menu_crm_case_resource_type" />
+
+      <menuitem action="crm_lead_resource_act"
+            id="menu_crm_lead_resource_act" name="Resource Type"
+            groups="base.group_extended" sequence="2"
+            parent="menu_crm_config_lead" />
 
 		<!-- CRM Lead Form View  -->
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e84bbb673ee..e2decc30340 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-    <menuitem action="crm_meeting_categ_action"
-        id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
+     <menuitem action="crm_meeting_categ_action" name="Categories"
+        id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
 
 	<!-- CRM Meetings Form View -->
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8b5cc42c502..407c3c53cf4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
         </record>
 
         <menuitem action="crm_opportunity_categ_action"
-            id="menu_crm_case_opportunity-act"
-            parent="crm.menu_crm_case_categ" />
+            id="menu_crm_case_opportunity-act" name="Categories"
+            parent="menu_crm_config_opportunity" />
 
         <!-- Opportunity Stages Form View-->
 
@@ -29,8 +29,8 @@
         </record>
 
         <menuitem action="crm_opportunity_stage_act"
-            id="menu_crm_opportunity_stage_act"
-            parent="crm.menu_crm_case_stage" />
+            id="menu_crm_opportunity_stage_act" name="Stages"
+            parent="menu_crm_config_opportunity" />
 
 		<!-- Opportunity Resource Type Form View -->
 
@@ -44,8 +44,8 @@
         </record>
 
         <menuitem action="crm_opportunity_resource_act"
-            id="menu_crm_opportunity_resource_act"
-            parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_opportunity_resource_act" name="Resource"
+            parent="menu_crm_config_opportunity" />
 
         <!-- Opportunities Form View -->
 
@@ -329,7 +329,7 @@
                     </search>
                 </field>
             </record>
-    
+
 
         <!-- Opportunities Graph View -->
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 65b77ed5abe..c5813a38b09 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.phonecall'}</field>
     </record>
 
-    <menuitem action="crm_phonecall_categ_action"
-        id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
+    <menuitem action="crm_phonecall_categ_action" name="Categories"
+        id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" />
 
 <!-- ResourceType Form View -->
 
@@ -27,10 +27,9 @@
             <field name="context">{'object_id':'crm.phonecall'}</field>
         </record>
 
-    <menuitem action="crm_phonecall_resource_act"
-        id="menu_crm_phonecall_resource_act"
-        parent="crm.menu_crm_case_resource_type" />
-
+     <menuitem action="crm_phonecall_resource_act"
+        id="menu_crm_phonecall_resource_act" name="Resource Type"
+        parent="menu_crm_config_phonecall" />
 
 <!--  PhoneCalls Tree View -->
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 52450419fd2..f854981858c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
+        <menuitem id="base.menu_crm_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="1" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_lead" name="Lead"
+            parent="base.menu_crm_config_sales" sequence="0" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_opportunity" name="Opportunity"
+            parent="base.menu_crm_config_sales" sequence="1" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_meeting" name="Meeting"
+            parent="base.menu_base_config" sequence="4" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_phonecall" name="Phone Call"
+            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
         	parent="base.menu_base_partner" sequence="8" />
@@ -117,9 +129,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
-
-		<!-- Case Categories Form View -->
+ <!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -156,11 +166,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
         <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act"
-            parent="base.menu_crm_configuration" />
+            id="menu_crm_case_section_act" sequence="4"
+            parent="base.menu_crm_config_sales" />
+
 
 
 		<!-- Resource Type of case Tree View -->
@@ -201,8 +211,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
-        <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="base.menu_crm_configuration" groups="base.group_extended" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -342,10 +350,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="crm_segmentation_tree-act"
+
+       <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended"
-            parent="base.menu_crm_configuration" />
+            groups="base.group_extended" sequence="5"
+            parent="base.menu_crm_config_sales" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index fa57cfdd1a5..dc1a6723786 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -115,31 +115,19 @@ class hr_si_project(osv.osv_memory):
         # get the latest action (sign_in or out) for this employee
         cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
         res = (cr.fetchone() or ('sign_out',))[0]
+        in_out = res == 'sign_out' and 'out' or 'in'
         #TODO: invert sign_in et sign_out
-        if res == 'sign_out':
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_in')])
-            resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-            return {
-                'name': 'Sign in / Sign out',
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.project',
-                'views': [(False,'tree'), (resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-                    }
-        else:
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_out')])
-            resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-            return {
-                'name': 'Sign in / Sign out',
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.out.project',
-                'views': [(False,'tree'), (resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-                    }
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)])
+        resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+            'name': 'Sign in / Sign out',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'hr.sign.%s.project' % in_out,
+            'views': [(False,'tree'), (resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
 
     def _get_empid(self, cr, uid, context=None):
         emp_obj = self.pool.get('hr.employee')
@@ -153,10 +141,7 @@ class hr_si_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         data = self.read(cr, uid, ids, [], context)[0]
         emp_id = data['emp_id']
-        try:
-            success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
-        except except_osv, e:
-            raise osv.except_osv(e.name, e.value)
+        success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -166,4 +151,4 @@ class hr_si_project(osv.osv_memory):
 
 hr_si_project()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 611416055f7..e5b7b426fe9 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -165,13 +165,9 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
+            <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+           parent="base.menu_base_config"  sequence="100"/>
 
-         <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
-
-        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-            parent="base.menu_crm_configuration"  sequence="20"/>
-            -->
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
             res_model="mailgate.message"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 99fd967b91d..55957619e31 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -47,14 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-	                    <filter icon="gtk-media-rewind" string="  365 Days  "
+	                    <filter icon="terp-go-year" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Production performed in last 365 Days"/>
-	                    <filter icon="gtk-media-rewind" string="   30 Days   "
+	                    <filter icon="terp-go-month" string="   30 Days   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Production performed in last 30 days"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -69,7 +69,7 @@
                    </group>
                    <newline/>
 
-                   <group expand="1" string="Group By...">
+                   <group expand="0" string="Group By...">
                     	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
                     	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
                     	<separator orientation="vertical"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a94ffac39d9..26488eae254 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -58,7 +58,7 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group colspan="10" col="12">
-	                    <filter icon="gtk-media-rewind" string="  365 Days  "
+	                    <filter icon="terp-go-year" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
 	                    <filter icon="terp-go-month" string="   30 Days   "
@@ -107,7 +107,7 @@
 	                    </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
+                    <group expand="0" string="Group By..." colspan="10" col="12">
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9631e3151f6..dd3ed036691 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -213,7 +213,7 @@
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
 	                    <filter string="Stage" icon="terp-stage" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
 	                    <filter string="Priority" icon="terp-rating-rated" domain="[]"
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 0ebbcd8e519..fd9d586f21e 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -162,7 +162,7 @@
             <field name="arch" type="xml">
                 <search string="Planning by Account">
                     <group col="8" colspan="4">
-                        <filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
+                        <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 72d4feb0ae9..10c5ccd9749 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -169,7 +169,7 @@
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                    <filter string="Source Document”" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Source Document" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 5dd8dd31900..8fb7836468d 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_purchase_order_graph">
+        <record model="ir.ui.view" id="view_purchase_order_report_graph">
             <field name="name">product.month.graph</field>
             <field name="model">purchase.report</field>
             <field name="type">graph</field>
@@ -88,7 +88,7 @@
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By..." colspan="10" col="12">
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 275c111225f..df0974fd9ed 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -55,7 +55,7 @@
                        <field name="resource_id" string="Resource" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 673fd14e76e..a3771b4a480 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,16 +44,16 @@
         <field name="arch" type="xml">
             <search string="Stock Move">
                 <group>
-                <filter icon="terp-stock"
+                <filter icon="terp-go-year"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
                     help="Stock Moves of the year"/>
-                <filter icon="terp-stock"
+                <filter icon="terp-go-month"
                  	name="month"
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
-	            <filter icon="terp-stock"
+	            <filter icon="terp-go-today"
                     string="Today"
                     separator="1"
                     domain="[('date_planned','&gt;=', time.strftime('%%Y-%%m-%%d')), ('date_planned','&lt;',(datetime.date.today()-datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d'))]"
@@ -61,39 +61,39 @@
                 <separator orientation="vertical"/>
 
                 <filter string="Waiting"
-                    	icon="terp-stock"
+                    	icon="terp-gtk-media-pause"
                     	domain="[('state','=','waiting')]"
                     	help = "Confirmed Stock-Moves"/>
 
                 <filter string="Available"
-                    	icon="terp-stock"
+                    	icon="terp-camera_test"
                     	domain="[('state','=','assigned')]"
                     	help = "Available Stock-Moves"/>
 
                 <filter string="Done"
                 		name="done"
-                    	icon="terp-stock"
+                    	icon="terp-dialog-close"
                     	domain="[('state','=','done')]"
                     	help = "Completed Stock-Moves"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
-                <filter icon="terp-stock" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
+                <filter icon="terp-go-home" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
+                <filter icon="terp-go-home" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." >
-                    <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter name="product" string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
+                <group expand="0" string="Group By..." >
+                    <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="src_location" string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
-                    <filter string="Dest. Location" icon="terp-stock"  context="{'group_by':'location_dest_id'}"/>
-                    <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
+                    <filter name="src_location" string="Source Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
+                    <filter string="Dest. Location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-stock" context="{'group_by':'date_planned'}"/>
-                    <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..."  groups="base.group_extended">
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index e570e2b55ea..a14298ff771 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,38 +54,38 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="gtk-media-rewind" string="  365 Days  "
+                   		<filter icon="terp-go-year" string="  365 Days  "
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="gtk-media-rewind" string="   30 Days   "
+	                	<filter icon="terp-go-month" string="   30 Days   "
 	                			name="month"
 	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                			help="Picking in last 30 days"/>
-	                	<filter icon="gtk-media-rewind"
+	                	<filter icon="terp-go-week"
                                 string="    7 Days    "
                                 separator="1"
                                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                                 help="Picking during last 7 days"/>
                         <separator orientation="vertical"/>
-                        <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
-                        <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
+                        <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
+                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
 						<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                   <group expand="0" string="Group By...">
+                        <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
                 	<group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 27f18d4ff43..34121d0c9ed 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,17 +9,17 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
-                        <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                        <filter icon="terp-go-home" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
+                        <filter icon="terp-go-home" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                        <filter icon="terp-go-home" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Location" icon="terp-go-home" domain="[]"  context="{'group_by':'location_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -155,12 +155,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
-                    <filter icon="gtk-media-rewind" name="stockable" string="Stockable"
+                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
-                    <filter icon="gtk-media-rewind" string="Consumable"
+                    <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consumable')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="gtk-media-rewind" string="Non Inv"
+                    <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 92653501ed3..d821ab39d51 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,9 +55,9 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
 
@@ -271,7 +271,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
+                        <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix"/>
                         <field name="name"/>
@@ -280,8 +280,8 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -438,11 +438,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
-                    <filter icon="terp-stock" name="in_location"
+                    <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
-                    <filter icon="terp-stock" name="customer"
+                    <filter icon="terp-go-home" name="customer"
                         string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                    <filter icon="terp-stock" name="supplier"
+                    <filter icon="terp-go-home" name="supplier"
                         string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
@@ -712,10 +712,10 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
@@ -723,10 +723,10 @@
                         <field name="address_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -859,20 +859,20 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -1041,8 +1041,8 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
 
                         <field name="name"/>
@@ -1051,11 +1051,11 @@
 
                    </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
                 </search>
             </field>
@@ -1216,9 +1216,9 @@
             <field name="arch" type="xml">
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
                         <separator orientation="vertical" />
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
@@ -1226,13 +1226,13 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
                 </search>
             </field>
@@ -1275,20 +1275,20 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
+                        <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
                         <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
             </field>
@@ -1397,9 +1397,9 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
+                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future stock moves"/>
-                        <filter icon="terp-stock" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
+                        <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
@@ -1407,18 +1407,18 @@
                         <field name="date_planned"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" name="by_product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Lot" name="prodlot_id" icon="terp-stock" domain="[]"  context="{'group_by':'prodlot_id'}"/>
-                        <filter string="Packing" name="picking_id" icon="terp-stock" domain="[]"  context="{'group_by':'picking_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Lot" name="prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
+                        <filter string="Packing" name="picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Source" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Destination" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Destination" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
+                        <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Creation" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected" icon="terp-stock" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                 </search>
             </field>
@@ -1451,7 +1451,7 @@
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="Uint Of Measure"/>
+                    <field name="product_uom" string="Unit Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
                     <field name="date_expected"/>
@@ -1526,9 +1526,9 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-                        <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-go-today" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <field name="origin" string="Latest Procurement"/>
                         <field name="partner_id" string="Supplier"/>
@@ -1539,12 +1539,12 @@
                        <field name="tracking_id" context="{'tracking_lot': self}" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'date_expected'}" />
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_expected'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index dfca96b0163..1bfb1d0f1aa 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -239,7 +239,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
                     <field name="company_id" select="1" widget="selection"/>
                     <field name="warehouse_id" select="1" widget="selection"/>
                     <field name="period_id" select="1" widget="selection"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f838739d0da..a604b7c7c37 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -255,8 +255,8 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter string="Open" icon="terp-stock" domain="[('state','=','open')]"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                        <filter string="Open" icon="terp-check" domain="[('state','=','open')]"/>
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
@@ -1065,13 +1065,13 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
-                        <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-emblem-important" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection" select="1"/>
                         <field name="email" select="1"/>
                         <field name="user_id" select="1" widget="selection" default="1">
-                        <filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                    </group>
                </search>