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/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 156ab3311f4..945066506d7 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -107,8 +107,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         #TODO: ids and context are not comming
         res = False
         msg_val = ''
-        res_id = False # Comes from context
-        model = None # Comes from context
+        res_id = context.get('active_id')
+        model = context.get('active_model')
         model_pool = self.pool.get(model)
         if not res_id or not model:
             return res
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 1e8c6fc8583..b6295cfa3a9 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -9,7 +9,7 @@
                 <form string="Forward to Partner">
                     <separator string="User" colspan="4" />
                     <field name="email_from" colspan="2" />
-                    <field name="history" colspan="2" on_change="on_change_history(history)"/>
+                    <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
                     <separator string="Send to" colspan="4" />
                     <field name="name" colspan="2" />
 					<group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 3ce73f07b12..6859150e855 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -15,9 +15,9 @@
             <attribute name="string">Select Human Resources Modules To Install</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='string'></attribute>
-	      		</xpath>
-          <xpath expr="//label[@string='description']"
+                <attribute name='string'></attribute>
+           </xpath>
+           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
@@ -31,7 +31,7 @@
             <field name="hr_attendance"/>
           </group>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
-          	<attribute name="string">Configure</attribute>
+              <attribute name="string">Configure</attribute>
           </xpath>
         </data>
       </field>
@@ -56,11 +56,11 @@
     <field name="name">hr_installer_action_replace</field>
     <field name="type">tree</field>
     <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-	<field name="arch" type="xml">
-  		 <xpath expr="//button[@string='Launch']" position="replace">
-        	<button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
-      		</xpath>
-      	</field>
-	</record>
+    <field name="arch" type="xml">
+           <xpath expr="//button[@string='Launch']" position="replace">
+            <button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+              </xpath>
+          </field>
+    </record>
   </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 36524395355..75da20cef20 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -106,7 +106,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-partner" domain="[('active','=',False)]" string="Unactive"
+                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
                         groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
@@ -114,12 +114,12 @@
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
                     <newline />
-                    <group expand="1" string="Group By...">
-                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical" />
-                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
                 </search>
              </field>
@@ -358,15 +358,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-check"
                         domain="[('state','in',('open','recruit'))]"
                         string="Current"
                         help="Open and in recruitment positions"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         domain="[('state','=','recruit')]"
                         string="Recruitment"
                         help="In Recruitment"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-camera_test"
                         domain="[('state','=','open')]"
                         string="Open"
                         help="Open Positions"/>
@@ -374,7 +374,7 @@
                     <separator orientation="vertical"/>
                     <field name="name"/>
                      <field name="department_id" widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-gtk-select-all"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             help="My Departments Jobs"/>
                     </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 8b9a68575b0..e3db974ebb5 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -48,16 +48,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-sale" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
-                    <filter icon="terp-sale" string="Today" domain="[('name::date','=',current_date)]" />
+                    <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <filter icon="terp-go-today" string="Today" domain="[('name::date','=',current_date)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" select="1" />
                     <field name="name" select="1"  />
                     <field name="action" select="1" />
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e4e8259bda4..40cebb98ef2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -133,21 +133,21 @@
             </field>
         </record>
 
-		<record id="hr_contract_view_search" model="ir.ui.view">
+        <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                   		<field name="name"/>
-                      	<field name="employee_id"/>
-                       	<field name="date_start"/>
-                       	<field name="date_end"/>
+                           <field name="name"/>
+                          <field name="employee_id"/>
+                           <field name="date_start"/>
+                           <field name="date_end"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Wage Type" icon="terp-project" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
                     </group>
                </search>
             </field>
@@ -217,7 +217,7 @@
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
-		<record id="hr_contract_type_view_form" model="ir.ui.view">
+        <record id="hr_contract_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
             <field name="type">form</field>
@@ -228,7 +228,7 @@
             </field>
         </record>
 
-		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+         <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.type.view.tree</field>
             <field name="model">hr.contract.type</field>
             <field name="type">tree</field>
@@ -250,7 +250,7 @@
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
-		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
+        <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
 
 
     </data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d02c76bc44c..a3e4cac2a5f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -13,8 +13,8 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." groups="base.group_multi_company">
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
+                   <group expand="0" string="Group By..." groups="base.group_multi_company">
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                </search>
             </field>
@@ -243,15 +243,15 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-crm" string="In progress" domain="[('state','=','wait')]"/>
-                        <filter icon="terp-mrp" string="Final Step" domain="[('state','=','progress')]"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                        <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                        <filter icon="terp-dialog-close" string="Final Step" domain="[('state','=','progress')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="gtk-media-rewind" string="7 Days"
+                        <filter icon="terp-go-week" string="7 Days"
                             help="Evaluations to close within the next 7 days"
                             domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         />
-                        <filter icon="gtk-media-rewind" string="Overpassed"
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed"
                             help="Evaluations that overpassed the deadline"
                             domain="[('date','&gt;=',(datetime.date.today()))]"
                         />
@@ -261,12 +261,12 @@
                         <field name="plan_id" widget="selection" select="1"/>
                         </group>
                         <newline/>
-                        <group expand='1' string='Group by...'>
-                        <filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
-                        <filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
-                        <filter string='State' icon="terp-stock" domain="[]" context="{'group_by' : 'state'}" />
+                        <group expand='0' string='Group by...'>
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='State' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string='Date' icon="terp-stock" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -344,10 +344,10 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id" widget="selection"/>
                         <field name="user_id" string="Interviewer" widget="selection"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 6ccd1e80ab9..5406a7a3fbd 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -42,32 +42,32 @@
         <field name="arch" type="xml">
             <search string="Evaluations Analysis">
             	<group>
-            		<filter icon="gtk-media-rewind" string="365 Days"
+            		<filter icon="terp-go-year" string="365 Days"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                     	help="Tasks performed in last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="30 Days"
+                    <filter icon="terp-go-month" string="30 Days"
                     	name="month"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                     	help="Tasks performed in last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <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'))]"
                         help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
-                    	icon="terp-hr"
+                    	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft Evaluations"/>
 	                <filter string="Plan In Progress"
-	                	icon="terp-hr"
+	                	icon="terp-camera_test"
 	                	domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation"
-                   		icon="terp-hr"
+                   		icon="terp-check"
                    		domain="[('state','=','progress')]"
                    		help = "Final Validation Evaluations"/>
-                   	<filter icon="terp-hr"
+                   	<filter icon="terp-dialog-close"
                         string="Done"
                         domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
@@ -75,16 +75,16 @@
 	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                    <filter string="Rating" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'create_date'}"/>
-                    <filter string="Year" icon="terp-hr" 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':'create_date'}"/>
+                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
                  <newline/>
 				<group expand="0" string="Extended options..." groups="base.group_extended">
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/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8aa0802fcda..90ee35d21e2 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -61,15 +61,15 @@
     </record>
 
     <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
-    
+
     <menuitem
         name="Ideas by Categories" parent="menu_ideas1"
         id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
-        
-    <menuitem name="Give Vote" parent="menu_ideas1"  
+
+    <menuitem name="Give Vote" parent="menu_ideas1"
     	id="menu_give_vote"
-    	action="action_idea_select"/>   
+    	action="action_idea_select"/>
 
 
     <!-- Open Ideas Action  -->
@@ -139,7 +139,7 @@
         </form>
         </field>
     </record>
-    
+
 <!-- Search view for Idea vote -->
 
     <record model="ir.ui.view" id="view_idea_vote_search">
@@ -153,10 +153,10 @@
 		            <field name="user_id" widget="selection"/>
 				</group>
 				<newline/>
-	            <group expand="1" string="Group By..." colspan="14">
-	            	<filter string="Vote date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
-	                <filter string="Idea" icon="terp-crm" domain="[]" context="{'group_by':'idea_id'}"/>
-	                <filter string="User" name="user" icon="terp-partner" domain="[]" context="{'group_by':'user_id'}"/>
+	            <group expand="0" string="Group By..." colspan="14">
+	            	<filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+	                <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
+	                <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
 	            </group>
 	        </search>
         </field>
@@ -218,20 +218,20 @@
                             <field name="score"/>
                             <field name="nbr"/>
                         </tree>
-                    </field>           
-            
+                    </field>
+
                 </page>
             </notebook>
             <group colspan="4" col="6">
                 <field name="state"/>
                 <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
                 <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/> 
+                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
             </group>
         </form>
         </field>
     </record>
-    
+
     <!-- New Idea Tree View -->
 
     <record model="ir.ui.view" id="view_idea_idea_tree">
@@ -249,7 +249,7 @@
             <field name="state"/>
             <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" type="action" states="open" string="Submit Vote"/>
             <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-            <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/> 
+            <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
         </tree>
         </field>
     </record>
@@ -263,9 +263,9 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group col="10" colspan="4">
-                    <filter icon="gtk-execute" string="Draft"
+                    <filter icon="terp-document-new" string="Draft"
                         domain="[('state','=','draft')]" help="Draft Ideas" />
-                    <filter icon="gtk-execute" string="Open"
+                    <filter icon="terp-camera_test" string="Open"
                         domain="[('state','=','open')]" help="Open Ideas" />
                     <separator orientation="vertical"/>
                     <field name="title" select="1"/>
@@ -273,10 +273,10 @@
                     <field name="user_id" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="12" col="10">
-                    <filter icon="gtk-execute" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
-                    <filter icon="gtk-execute" string="State" help="By States" context="{'group_by':'state'}"/>
-                    <filter icon="gtk-execute" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
+                <group expand="0" string="Group By..." colspan="12" col="10">
+                    <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
+                    <filter icon="terp-stock_effects-object-colorize" string="State" help="By States" context="{'group_by':'state'}"/>
+                    <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
                 </group>
             </search>
         </field>
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/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index fb88b6d283d..3e2d7330291 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -29,20 +29,20 @@
                         <field name="condition" colspan="4"/>
                         <newline/>
                         <field name="type" colspan="4"/>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
+                        <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >
                             <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
                         </group>
                         <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
                             <field name="report_id" attrs="{'required':[('type','=','paper')]}"/>
                             <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
                         </group>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >                
+                        <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
                             <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
                         </group>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
+                        <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >
                             <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
                             <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                        </group>                
+                        </group>
                         <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
                              <form string="Out Transitions" >
                                  <field name="activity_from_id" readonly="True"/>
@@ -56,7 +56,7 @@
                                  <field name="interval_nbr"/>
                                  <field name="interval_type"/>
                              </tree>
-                         </field> 
+                         </field>
                          <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
                              <form string="In Transitions" >
                                  <field name="activity_from_id"/>
@@ -77,14 +77,14 @@
                         <field name="object_id"/>
                         <field name="start"/>
                         <field name="condition"/>
-                        <field name="variable_cost" select="1"/>                    
+                        <field name="variable_cost" select="1"/>
                         <field name="type"/>
                         <field name="report_id"/>
                          <field name="to_ids"/>
                         <field name="subcampaign_id"/>
                         <field name="subcampaign_segment_id"/>
                     </tree>
-                </field>    
+                </field>
                 <separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
@@ -121,7 +121,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="start" invisible="1"/>
-                    <field name="condition"/> 
+                    <field name="condition"/>
                   </node>
                   <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']">
                     <field name="activity_from_id"/>
@@ -139,19 +139,19 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Campaigns">
-               <filter icon="terp-marketing" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-marketing" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-marketing" string="Manual Mode" domain="[('mode','=','manual')]"/>
+               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
+               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="object_id" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Object" name="Object" icon="terp-marketing" context="{'group_by':'object_id'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group>   
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Object" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -165,12 +165,12 @@
         <field name="view_id" ref="view_marketing_campaign_tree"/>
        <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}</field>
        <field name="search_view_id" ref="view_marketing_campaign_search"/>
-        
+
     </record>
 
 	<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
-		        
+
     <!--
     ======================
     Marketing Segments
@@ -232,22 +232,22 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Segments">
-               <filter icon="terp-marketing" string="Draft" name="draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-marketing" string="Create Date" name="create_date" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-marketing" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
+               <filter icon="terp-go-month" string="Create Date" name="create_date" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-go-month" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="object_id" select="1"/>
                <field name="campaign_id" select="1"/>
                <field name="date_run" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
-                   <filter string="Date Run" name="Date Run" icon="terp-marketing" context="{'group_by':'date_run'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group> 
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
+                   <filter string="Date Run" name="Date Run" icon="terp-go-month" context="{'group_by':'date_run'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -264,7 +264,7 @@
     </record>
 
     <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
-        
+
     <!--
     ======================
     Marketing Activities
@@ -283,20 +283,20 @@
                 <field name="object_id" readonly="True"/>
                 <newline/>
                 <field name="type"/>
-                <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
+                <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >
                     <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
                 </group>
                 <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
                     <field name="report_id" attrs="{'required':[('type','=','paper')]}" />
                     <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
                 </group>
-                <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >                
+                <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
                     <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
                 </group>
-                <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
+                <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >
                     <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
                     <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                </group>                
+                </group>
                 <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
                      <form string="Out Transitions" >
                          <field name="activity_from_id" readonly="True"/>
@@ -310,7 +310,7 @@
                          <field name="interval_nbr"/>
                          <field name="interval_type"/>
                      </tree>
-                 </field> 
+                 </field>
                  <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
                      <form string="In Transitions" >
                          <field name="activity_from_id"/>
@@ -357,9 +357,9 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_activity_tree"/>
     </record>
-    
+
        <!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /-->
-    
+
     <!--
     ======================
     Marketing Workitems
@@ -407,22 +407,22 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Workitems">
-               <filter icon="terp-marketing" string="To Do" name = "todo" domain="[('state','=','todo')]"/>
-               <filter icon="terp-marketing" string="In Progress" domain="[('state','=','inprogress')]"/>
-               <filter icon="terp-marketing" string="Exception" domain="[('state','=','exception')]"/>
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name = "todo" domain="[('state','=','todo')]"/>
+               <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','inprogress')]"/>
+               <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                <separator orientation="vertical"/>
                <field name="segment_id" select="1"/>
                <field name="object_id" select="1"/>
                <field name="partner_id" select="1"/>
                <field name="date" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Segment" name="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="Activity" icon="terp-marketing" context="{'group_by':'activity_id'}" />
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
+                   <filter string="Activity" name="Activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Date" name="Date" icon="terp-marketing" context="{'group_by':'date'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group> 
+                   <filter string="Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -435,10 +435,10 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
         <field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
-        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>        
+        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
-    
+
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 9963075dce6..d7827033809 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -30,15 +30,15 @@
         <field name="arch" type="xml">
             <search string="Marketing Reports">
            		<group>
-	            	<filter icon="terp-marketing"
+	            	<filter icon="terp-go-year"
 	                    	string="This Year"
 	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-marketing"
+	                <filter icon="terp-go-month"
 	                    	string="This Month"
 	                    	domain="[('month','=',time.strftime('%%m'))]"/>
 	                <separator orientation="vertical"/>
-		            <filter icon="terp-marketing" 
-		            		string="Date" 
+		            <filter icon="terp-go-month"
+		            		string="Date"
 		            		domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
 	                <separator orientation="vertical"/>
 					<field name="campaign_id"/>
@@ -48,14 +48,14 @@
 					<field name="country_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
-                    <filter string="Partner" icon="terp-marketing" context="{'group_by':'partner_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
+                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-marketing" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-marketing" context="{'group_by':'year'}"/>
-                </group>                
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                </group>
             </search>
         </field>
     </record>
@@ -68,9 +68,9 @@
         <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
-    
+
 	<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
     <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
-		
+
 	</data>
 </openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 00dde266b4b..2ba81d2c1ee 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -116,14 +116,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                    <field name="membership_state" select="1">
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
-                        <filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
-                    </field>
+                    <group col="4" colspan="6">
+                        <filter string="Members" icon="terp-personal" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <field name="membership_state"/>
+                    </group>
                </field>
             </field>
         </record>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 00c1c62f0ff..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>
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>