diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4f9893960bf..d2659e92d1c 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-16 09:47+0000\n"
+"PO-Revision-Date: 2010-06-03 20:09+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -272,10 +272,6 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"zeigt die Ansicht des Journalberichtes. Open ERP wird gezeigt welche Felder "
-"sichtbar sein sollen, welche erforderlich sind oder keine Schreibrechte habe "
-"und in der Reihenfolge der Auftragsnummern. Sie können einen eigenen View "
-"für eine schnellere Buchungsbearbeitung herstellen."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2176,7 +2172,8 @@ msgid "Analytic Entry"
 msgstr "Buchung Analysekonto"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Text Zahlungserinnerung"
 
@@ -3314,7 +3311,9 @@ msgstr "Buchen OP Ausgleich"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Rechnungen müssen ausgeglichen werden)"
+msgstr ""
+"(Rechnungen dürfen nicht ausgeglichen sein, wenn diese wieder geöffnet "
+"werden sollen)"
 
 #. module: account
 #: view:account.invoice:0
@@ -5314,7 +5313,7 @@ msgstr "Benutze Buchungsvorlage"
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr "Nummer"
+msgstr "Nein"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -6062,3 +6061,6 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Berechne eingegebene Daten"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index e969ecfa9ad..b6255217c5a 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
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..84cc82ebe8b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -146,8 +146,8 @@
                        	<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>
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_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index abce10e80f3..35ffc931831 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -127,18 +127,18 @@
                 <search string="Expense">
                     <group>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-document-new"
                         domain="[('state','=','draft')]"
                         string="Draft"
                         help="Draft Expense"/>
                       <separator orientation="vertical"/>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-gtk-go-back-rtl"
                         domain="[('state','=','confirm')]"
                         string="To Validate"
                         help="Confirmed Expense"/>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-gtk-go-back-rtl"
                         domain="[('state','=','accepted')]"
                         string="To Pay"
                         help="Expenses to Invoice"/>
@@ -146,18 +146,18 @@
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection" string="User">
-                      		<filter icon="terp-hr"
+                      		<filter icon="terp-personal+"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
                       <field name="department_id" widget="selection" groups="base.group_extended"/>
                 </group>
                 <newline />
-                <group expand="1" string="Group By...">
-                    <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                 </group>
                 </search>
             </field>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 6507ff87342..a4aa15e7076 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -51,29 +51,29 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
             	<group>
-            		<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="Expenses during last 7 year"/>
-	                <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="Expenses during last month"/>
-		            <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="Expenses during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
-	                    icon="terp-hr"
+	                    icon="terp-document-new"
 	                    domain="[('state','=','draft')]"
 	                    help = "Draft Expenses"/>
 		            <filter string="Waiting"
-		                icon="terp-hr"
+		                icon="terp-gtk-media-pause"
 		                domain="[('state', '=' ,'confirm')]"
 		                help = "Confirm Expenses"/>
 	                <filter string="Accepted"
-	                    icon="terp-hr"
+	                    icon="terp-camera_test"
 	                    domain="[('state','=','accepted')]"
 	                    help = "Accepted Expenses"/>
 	  				<separator orientation="vertical"/>
@@ -87,22 +87,22 @@
                     </field>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
-                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
+                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Force Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                    <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':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
 				<newline/>
 				<group expand="0" string="Extended filters..." groups="base.group_extended">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 74546ff1388..fc9626d831d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,27 +8,27 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
-                        <filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"
+                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" widget="selection"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-hr" help="My Department Holidays"
+                            <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]"
                                 />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline />
-                    <group expand="1" string="Group By...">
-                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'holiday_status_id'}"
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
                     </group>
                 </search>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 34f14271758..5fd9a9c0199 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -48,21 +48,21 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-	                    <filter icon="terp-hr" string="Employee"
+	                    <filter icon="terp-personal" string="Employee"
 	                            domain="[('category_id', '=', False)]"
 	                            help="Leaves by empolyee"/>
-	                    <filter icon="terp-hr" string="Category"
+	                    <filter icon="terp-stock_symbol-selection" string="Category"
 	                            domain="[('employee_id', '=', False)]"
 	                            help="Leaves by category"/>
                         <separator orientation="vertical"/>
-		            	<filter icon="terp-hr" string="This Year"
+		            	<filter icon="terp-go-year" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
-		                <filter icon="terp-hr" string="This Month"
+		                <filter icon="terp-go-month" string="This Month"
 		                    name="month"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves in this month"/>
-			            <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'))]"
@@ -71,7 +71,7 @@
 
 						<field name="employee_id"/>
 		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-hr"
+		                    <filter icon="terp-personal"
 		                        string="My Leaves"
 		                        domain="[('user_id','=',uid)]"/>
 		                </field>
@@ -82,15 +82,15 @@
 	                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-	                    <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':'month'}"/>
+	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
 	            </search>
 	        </field>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index b6afe32fb25..24ea6745270 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -45,36 +45,36 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
-                    <filter icon="terp-hr" string="Employee"
+                    <filter icon="terp-personal" string="Employee"
                             domain="[('category_id', '=', False)]"
                             help="Leaves by empolyee"/>
-                    <filter icon="terp-hr" string="Category"
+                    <filter icon="terp-stock_symbol-selection" string="Category"
                             domain="[('employee_id', '=', False)]"
                             help="Leaves by category"/>
 	            	<separator orientation="vertical"/>
-	            	<filter icon="terp-hr" string="This Year"
+	            	<filter icon="terp-go-year" string="This Year"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves in this year"/>
-	                <filter icon="terp-hr" string="This Month"
+	                <filter icon="terp-go-month" string="This Month"
 	                    name="month"
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Leaves in this month"/>
-		            <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="Leaves during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
-	                	icon="terp-hr"
+	                	icon="terp-document-new"
 	                	domain="[('state','=','draft')]"
 	                	help = "Draft Leaves"/>
 	                <filter string="Waiting Validation"
-	                	icon="terp-hr"
+	                	icon="terp-gtk-media-pause"
 	                	domain="[('state', '=' ,'confirm')]"
 	                	help = "In progress Leaves"/>
 	               	<filter string="Validated"
-	               		icon="terp-hr"
+	               		icon="terp-camera_test"
 	               		domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
@@ -83,20 +83,20 @@
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_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':'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':'date'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-hr"
+                    <filter icon="terp-gtk-stop"
                             string="Refused"
                         name="done"
                             domain="[('state','=','refuse')]"/>
@@ -105,7 +105,7 @@
                     <separator orientation="vertical"/>
                     <field name="holiday_status_id" widget="selection"/>
                     <newline/>
-                    <filter icon="terp-hr"
+                    <filter icon="terp-gtk-stop"
                             string="Cancelled"
                             domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 65d5db06fe3..5183587e992 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -216,20 +216,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="gtk-new" string="Current"
+               <filter icon="terp-check" string="Current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                    default="1"
                />
-               <filter icon="gtk-new" string="New"
+               <filter icon="terp-document-new" string="New"
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
                />
-               <filter icon="gtk-yes" string="In Progress"
+               <filter icon="terp-camera_test" string="In Progress"
                    domain="[('state','=','open')]"
                    help="Open Jobs"
                />
-               <filter icon="gtk-media-pause" string="Pending"
+               <filter icon="terp-gtk-media-pause" string="Pending"
                    domain="[('state','=','pending')]"
                    help="Pending Jobs"
                />
@@ -238,27 +238,27 @@
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
+                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-hr" context="{'invisible_department': False}"
+                   <filter icon="terp-personal+" context="{'invisible_department': False}"
                        domain="[('department_id','=',context.get('department_id',False))]"
                        help="My Department"/>
                </field>
                <newline/>
                 <group expand="0" string="Group By..." colspan="11" col="20">
-                    <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Job" icon="terp-project" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Degree" icon="terp-project" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Availability" icon="terp-project" domain="[]" context="{'group_by':'availability'}"/>
-                    <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
+                    <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Appreciation" icon="terp-project" domain="[]" context="{'group_by':'priority'}"/>
+                    <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                 </group>
            </search>
         </field>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8a9e913a454..4fca4a8b239 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -47,29 +47,29 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
             	<group>
-            	    <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="Recruitment performed in last 356 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="Recruitment performed in this month"/>
-		            <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="Recruitment during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
-                    	icon="terp-hr"
+                    	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
 	                <filter string="Current"
-	                	icon="terp-hr"
+	                	icon="terp-check"
 	                	domain="[('state', '=' ,'open')]"
 	                	help = "In progress recruitment"/>
                    	<filter string="Pending"
-                   		icon="terp-hr"
+                   		icon="terp-gtk-media-pause"
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
   					<separator orientation="vertical"/>
@@ -83,21 +83,21 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By ...">
-                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                <group expand="0" string="Group By ...">
+                   <filter string="User" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                   <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
+            	   <filter string="Day" name = "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/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7c12b14df7..947f0d34c41 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -50,7 +50,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <filter icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="account_id" select="1" widget="selection"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 880e5837fd2..5712aff7736 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -47,21 +47,21 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group col="10" colspan="4">
-                    	<filter icon="terp-hr" string="This Year"
+                    	<filter icon="terp-go-year" string="This Year"
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Timesheet lines in this year"/>
-	                    <filter icon="terp-hr" string="This Month"
+	                    <filter icon="terp-go-month" string="This Month"
 	                    		name="month"
 	                    		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Timesheet lines in this month"/>
-		                <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="Timesheet lines during last 7 days"/>
 	                    <separator orientation="vertical"/>
 	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
+	                        <filter icon="terp-personal"
 	                        		string="Non Assigned timesheets to users"
 	                        		help="Non Assigned timesheets to users"
 	                        		domain="[('user_id','=',False)]"/>
@@ -69,24 +69,12 @@
 	                    <field name="account_id"/>
                         <field name="product_id"/>
                     </group>
-                    <group expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
+                        <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                        <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
@@ -177,8 +165,8 @@
                 <search string="Timesheet by user">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -316,8 +304,8 @@
                 <search string="Daily timesheet by account">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -390,8 +378,8 @@
                 <form string="Timesheet by account">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -454,18 +442,18 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet Lines">
                    <group col='15' colspan='4'>
-                        <filter icon="terp-project" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-check" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                     	<field name="user_id" widget="selection"/>
                     	<field name="product_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                   <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
-                   		<filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+                   		<filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index da501ad5ab4..7d24e8c26ec 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -18,8 +18,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_analytic_account_close_tree" model="ir.ui.view">
             <field name="name">report.analytic.account.close.tree</field>
             <field name="model">report.analytic.account.close</field>
@@ -36,7 +36,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_analytic_account_graph" model="ir.ui.view">
             <field name="name">report.analytic.account.close.graph</field>
             <field name="model">report.analytic.account.close</field>
@@ -45,11 +45,11 @@
                 <graph string="Expired analytic accounts" type="bar">
                     <field name="partner_id"/>
                     <field name="quantity" operator="+"/>
-                    <field name="quantity_max" operator="+"/> 
+                    <field name="quantity_max" operator="+"/>
                 </graph>
             </field>
         </record>
-        
+
         <record id="action_analytic_account_tree" model="ir.actions.act_window">
             <field name="name">Expired analytic accounts</field>
             <field name="res_model">report.analytic.account.close</field>
@@ -116,8 +116,8 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group col="12" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+                   		<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
@@ -138,6 +138,6 @@
         <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
 
         <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 35c20fdce08..f686daf575e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -192,21 +192,21 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 domain="[('department_id','=',context.get('department_id',False))]"
                                 help="My Departments Timesheet"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 32e8bda4f7f..0cba7ad179b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -46,29 +46,29 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col="10" colspan="12">
-                        <filter icon="terp-hr" string="This Year"
+                        <filter icon="terp-go-year" string="This Year"
 	                    	    domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Timesheet in this year"/>
-	                    <filter icon="terp-hr" string="This Month"
+	                    <filter icon="terp-go-month" string="This Month"
 	                    		name="month"
 	                    		domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Timesheet in this month"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Timesheet during last 7 days"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-document-new"
                     			string="Draft"
                     			domain="[('state','=','draft')]"/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-camera_test"
 	                    		string="Confirmed"
 	                    		domain="[('state','=','confirm')]"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="product_id"/>
 	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
+	                        <filter icon="terp-personal-"
 	                        		string="Non Assigned timesheets to users"
 	                        		help="Non Assigned timesheets to users"
 	                        		domain="[('user_id','=',False)]"/>
@@ -76,25 +76,25 @@
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By...">
+	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
-	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
+	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+	                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+	                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_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':'month'}"/>
-	                    <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':'month'}"/>
+	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
-	                	<filter icon="terp-hr"
+	                	<filter icon="terp-document-new"
 	                    		string="New"
 	                    		domain="[('state','=','new')]"/>
 	                    <separator orientation="vertical"/>
@@ -103,7 +103,7 @@
 	                    <field name="account_id"/>
 	                    <field name="department_id" widget="selection"/>
 	                    <newline/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-dialog-close"
 		                    		string="Done"
 		                    		domain="[('state','=','done')]"/>
 	                    <separator orientation="vertical"/>
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/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>