From 5ebcc01fda2f102486ac68809655630668e6fd59 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Mon, 3 Aug 2015 14:20:15 +0200
Subject: [PATCH] [REF] *: search view: remove deprecated icon from filters

---
 addons/account/views/account_view.xml         | 42 ++++++------
 .../account_analytic_default_view.xml         | 10 +--
 addons/account_budget/account_budget_view.xml |  4 +-
 .../account_voucher/account_voucher_view.xml  | 14 ++--
 addons/analytic/views/analytic_view.xml       |  2 +-
 addons/calendar/calendar_view.xml             |  8 +--
 addons/crm_claim/crm_claim_view.xml           | 16 ++---
 .../crm_partner_assign/res_partner_view.xml   |  2 +-
 addons/fetchmail/fetchmail_view.xml           |  6 +-
 addons/hr/hr_view.xml                         |  8 +--
 .../hr_equipment/views/hr_equipment_views.xml | 32 ++++-----
 addons/hr_evaluation/hr_evaluation_view.xml   | 22 +++----
 addons/hr_payroll/hr_payroll_view.xml         | 26 ++++----
 addons/hr_timesheet/hr_timesheet_view.xml     |  8 +--
 .../hr_timesheet_invoice_view.xml             |  4 +-
 .../hr_timesheet_invoice_report_view.xml      | 16 ++---
 .../hr_timesheet_sheet_view.xml               |  2 +-
 addons/l10n_be_coda/l10n_be_coda_view.xml     |  8 +--
 .../l10n_in_hr_payroll_view.xml               | 12 ++--
 addons/mail/views/mail_mail_views.xml         | 14 ++--
 addons/mail/views/mail_template_views.xml     |  4 +-
 .../marketing_campaign_view.xml               | 48 +++++++-------
 addons/membership/membership_view.xml         | 24 +++----
 addons/mrp/mrp_view.xml                       | 52 +++++++--------
 addons/mrp_operations/mrp_operations_view.xml | 16 ++---
 addons/mrp_repair/mrp_repair_view.xml         | 18 ++---
 addons/note/note_view.xml                     |  2 +-
 addons/point_of_sale/point_of_sale_view.xml   | 36 +++++-----
 addons/procurement/procurement_view.xml       | 10 +--
 addons/product/product_view.xml               |  8 +--
 addons/purchase/purchase_view.xml             | 22 +++----
 .../purchase_double_validation_view.xml       |  2 +-
 .../purchase_requisition_view.xml             | 20 +++---
 addons/resource/resource_view.xml             | 16 ++---
 addons/sale/sale_view.xml                     | 28 ++++----
 addons/sale_stock/report/sale_report_view.xml |  2 +-
 addons/sale_stock/sale_stock_view.xml         |  2 +-
 addons/stock/product_view.xml                 |  2 +-
 addons/stock/report/report_stock_view.xml     |  8 +--
 addons/stock/stock_view.xml                   | 66 +++++++++----------
 addons/subscription/subscription_view.xml     |  9 ++-
 doc/reference/views.rst                       |  4 --
 openerp/addons/base/ir/ir_actions.xml         |  4 +-
 openerp/addons/base/ir/ir_attachment_view.xml | 17 ++---
 openerp/addons/base/ir/ir_cron_view.xml       |  5 +-
 openerp/addons/base/ir/ir_model_view.xml      | 50 +++++---------
 openerp/addons/base/ir/ir_rule_view.xml       |  2 +-
 .../addons/base/ir/ir_translation_view.xml    |  3 +-
 openerp/addons/base/ir/ir_values_view.xml     |  4 +-
 openerp/addons/base/res/ir_property_view.xml  |  3 +-
 openerp/addons/base/res/res_bank_view.xml     |  2 +-
 openerp/addons/base/res/res_lang_view.xml     |  2 +-
 openerp/addons/base/res/res_partner_view.xml  |  4 +-
 openerp/addons/base/rng/view.rng              |  1 -
 .../addons/base/workflow/workflow_view.xml    | 12 ++--
 55 files changed, 366 insertions(+), 398 deletions(-)

diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 3002ea8a9d6..b8899148606 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -107,11 +107,11 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','=like',str(self)+'%')]" string="Account"/>
-                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('internal_type','=','receivable')]"/>
-                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('internal_type','=','payable')]"/>
+                    <filter string="Receivable Accounts" domain="[('internal_type','=','receivable')]"/>
+                    <filter string="Payable Accounts" domain="[('internal_type','=','payable')]"/>
                     <field name="user_type_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type_id'}"/>
+                        <filter string="Account Type" domain="" context="{'group_by':'user_type_id'}"/>
                     </group>
                 </search>
             </field>
@@ -220,10 +220,10 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
-                    <filter domain="[('type', '=', 'sale')]" string="Sale" icon="terp-camera_test"/>
-                    <filter domain="[('type', '=', 'purchase')]" string="Purchase" icon="terp-purchase"/>
-                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
-                    <filter domain="[('type', 'not in', ['sale', 'purchase', 'cash', 'bank'])]" string="Miscellaneous" icon="terp-stock"/>
+                    <filter domain="[('type', '=', 'sale')]" string="Sale"/>
+                    <filter domain="[('type', '=', 'purchase')]" string="Purchase"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity"/>
+                    <filter domain="[('type', 'not in', ['sale', 'purchase', 'cash', 'bank'])]" string="Miscellaneous"/>
                     <separator/>
                     <filter name="dashboard" string="Favorites" domain="[('show_on_dashboard', '=', True)]"/>
                 </search>
@@ -411,13 +411,13 @@
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
                     <field name="date"/>
-                    <filter string="Draft" domain="[('state','=','open')]" icon="terp-document-new"/>
-                    <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                    <filter string="Draft" domain="[('state','=','open')]"/>
+                    <filter string="Confirmed" domain="[('state','=','confirm')]"/>
                     <field name="journal_id" domain="[('type', '=', 'bank')]" />
                     <group expand="0" string="Group By">
-                        <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                        <filter string="Date" context="{'group_by': 'date'}" icon="terp-go-month"/>
+                        <filter string="Journal" context="{'group_by': 'journal_id'}"/>
+                        <filter string="Status" context="{'group_by': 'state'}"/>
+                        <filter string="Date" context="{'group_by': 'date'}"/>
                     </group>
                 </search>
             </field>
@@ -1245,8 +1245,8 @@
                 <search string="Search Move">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
                     <field name="date"/>
-                    <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
+                    <filter string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
+                    <filter string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                     <separator/>
                     <filter string="Sales" domain="[('journal_id.type','=','sale')]" context="{'default_journal_type': 'sale'}"/>
                     <filter string="Purchases" domain="[('journal_id.type','=','purchase')]" context="{'default_journal_type': 'purchase'}"/>
@@ -1430,7 +1430,7 @@
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
                     <field name="user_type_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type_id'}"/>
+                        <filter string="Account Type" domain="[]" context="{'group_by':'user_type_id'}"/>
                    </group>
                 </search>
             </field>
@@ -1483,10 +1483,10 @@
                     <field name="bank_account_code_prefix"/>
                     <field name="cash_account_code_prefix"/>
                     <group expand="0" string="Group By">
-                        <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable_id'}"/>
-                        <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable_id'}"/>
-                        <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ_id'}"/>
-                        <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ_id'}"/>
+                        <filter string="Receivable Account" domain="[]" context="{'group_by':'property_account_receivable_id'}"/>
+                        <filter string="Payable Account" domain="[]" context="{'group_by':'property_account_payable_id'}"/>
+                        <filter string="Income Account" domain="[]" context="{'group_by':'property_account_income_categ_id'}"/>
+                        <filter string="Expense Account" domain="[]" context="{'group_by':'property_account_expense_categ_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1589,8 +1589,8 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
-                    <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
-                    <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
+                    <filter string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
+                    <filter string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                     <field name="chart_template_id"/>
                 </search>
             </field>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index a1e1a933bfa..c26633d8069 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -50,11 +50,11 @@
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By">
-                        <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
-                        <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
-                        <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
+                        <filter string="User" context="{'group_by':'user_id'}" help="User"/>
+                        <filter string="Partner" context="{'group_by':'partner_id'}" help="Partner"/>
+                        <filter string="Product" context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Analytic Account" context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company" />
                     </group>
                 </search>
             </field>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 0b335758fef..13302117ae2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -159,8 +159,8 @@
                     <field name="name" filter_domain="[('name','ilike',self)]" string="Budget"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                    <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                    <filter string="Draft" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                    <filter string="To Approve" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                     <field name="state"/>
                 </search>
             </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index dc5c405529b..645fa92078f 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -122,17 +122,17 @@
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
                     <field name="date"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                    <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                    <filter string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                    <filter string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <separator/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
+                    <filter string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" /> <!-- Keep widget=selection on this field to pass numeric `self` value, which is not the case for regular m2o widgets! -->
                     <group expand="0" string="Group By">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date','visible':True}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Date" domain="[]" context="{'group_by':'date','visible':True}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml
index a848b3d0a24..d45e4ea960e 100644
--- a/addons/analytic/views/analytic_view.xml
+++ b/addons/analytic/views/analytic_view.xml
@@ -328,7 +328,7 @@
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
                    <field name="type"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index de03ea448e1..4bfc5b685f8 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -277,14 +277,14 @@
                 <field name="user_id"/>
                 <field name="show_as"/>
                 <field name="class" string="Privacy"/>
-                <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
+                <filter string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
                 <filter string="My Meetings" help="My Meetings" name="mymeetings" context='{"mymeetings": 1}'/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <group expand="0" string="Group By">
-                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
-                    <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>                    
+                    <filter string="Responsible" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Availability" domain="[]" context="{'group_by':'show_as'}"/>
+                    <filter string="Privacy" domain="[]" context="{'group_by':'class'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 677023b5103..7a7790b6772 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -210,17 +210,17 @@
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
                     <separator/>
-                    <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
+                    <filter string="Unassigned Claims" domain="[('user_id','=', False)]" help="Unassigned Claims" />
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
-                        <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                        <filter string="Claim Month" icon="terp-go-month" domain="[]" help="Claim Date by Month" context="{'group_by':'date'}"/>
-                        <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}"  groups="base.group_no_one" invisible="1"/>
+                        <filter string="Partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
+                        <filter string="Responsible" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
+                        <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'categ_id'}"/>
+                        <filter string="Claim Month" domain="[]" help="Claim Date by Month" context="{'group_by':'date'}"/>
+                        <filter string="Deadline" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Closure" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}"  groups="base.group_no_one" invisible="1"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 3f771784451..174ba0277e9 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -99,7 +99,7 @@
         <field name="inherit_id" ref="base.view_res_partner_filter"/>
         <field name="arch" type="xml">
             <filter name="salesperson" position="after">
-                <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
+                <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]"/>
             </filter>
             <field name="category_id" position="after">
                 <field name="grade_id"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 6b0b284b290..9c746573414 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -77,10 +77,10 @@
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
-                    <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
-                    <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
+                    <filter string="IMAP" domain="[('type','=','imap')]" help="Server type IMAP."/>
+                    <filter string="POP" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator/>
-                    <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
+                    <filter string="SSL" domain="[('is_ssl','=',True)]" help="If SSL required."/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 43bab3019a3..9c8d7769609 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -137,11 +137,11 @@
                     <field name="job_id" />
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <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'}"/>
+                        <filter string="Manager" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" domain="[]" context="{'group_by':'coach_id'}"/>
                         <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Job" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml
index 8279252193d..ebec9eb7c8d 100644
--- a/addons/hr_equipment/views/hr_equipment_views.xml
+++ b/addons/hr_equipment/views/hr_equipment_views.xml
@@ -14,14 +14,14 @@
                 <field name="employee_id"/>
                 <field name="stage_id"/>
                 <separator/>
-                <filter string="My Requests" icon="terp-accessories-archiver" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
+                <filter string="My Requests" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
                 <separator/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <group  expand='0' string='Group by...'>
-                    <filter string='Users' icon="terp-personal" domain="[]" context="{'group_by': 'user_id'}"/>
-                    <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'category_id'}"/>
-                    <filter string='Stages' icon="terp-mrp" domain="[]" context="{'group_by' : 'stage_id'}"/>
-                    <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by': 'employee_id'}"/>
+                    <filter string='Users' domain="[]" context="{'group_by': 'user_id'}"/>
+                    <filter string='Category' domain="[]" context="{'group_by' : 'category_id'}"/>
+                    <filter string='Stages' domain="[]" context="{'group_by' : 'stage_id'}"/>
+                    <filter string='Employee' domain="[]" context="{'group_by': 'employee_id'}"/>
                 </group>
             </search>
         </field>
@@ -338,20 +338,20 @@
                 <field name="employee_id"/>
                 <field name="department_id"/>
                 <field name="model"/>
-                <filter string="New" help="Unassigned" icon="terp-accessories-archiver" domain="[('employee_id', '=', False), ('department_id', '=', False)]"/>
-                <filter string="To Do" help="Under Maintenance" icon="terp-accessories-archiver" domain="[('maintenance_ids', '!=', False), ('maintenance_ids.stage_id.fold', '=', False)]"/>
-                <filter string="Assigned" icon="terp-accessories-archiver" domain="['|', ('employee_id', '!=', False), ('department_id', '!=', False)]"/>
+                <filter string="New" help="Unassigned" domain="[('employee_id', '=', False), ('department_id', '=', False)]"/>
+                <filter string="To Do" help="Under Maintenance" domain="[('maintenance_ids', '!=', False), ('maintenance_ids.stage_id.fold', '=', False)]"/>
+                <filter string="Assigned" domain="['|', ('employee_id', '!=', False), ('department_id', '!=', False)]"/>
                 <separator/>
-                <filter string="My Equipments" icon="terp-accessories-archiver" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
+                <filter string="My Equipments" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
                 <separator/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <group  expand='0' string='Group by...'>
-                    <filter string='Users' icon="terp-personal" domain="[]" context="{'group_by': 'user_id'}"/>
-                    <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by': 'category_id'}"/>
-                    <filter string='Assigned to' help="Assigned to Employees and Departments" icon="terp-personal" domain="[]" context="{'group_by': 'equipment_assign_to'}"/>
-                    <filter string='Department' help="Assigned to Departments" icon="terp-personal" domain="[]" context="{'group_by': 'department_id'}"/>
-                    <filter string='Employee' help="Assigned to Employees" icon="terp-personal" domain="[]" context="{'group_by': 'employee_id'}"/>
-                    <filter string='Vendor' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string='Users' domain="[]" context="{'group_by': 'user_id'}"/>
+                    <filter string='Category' domain="[]" context="{'group_by': 'category_id'}"/>
+                    <filter string='Assigned to' help="Assigned to Employees and Departments" domain="[]" context="{'group_by': 'equipment_assign_to'}"/>
+                    <filter string='Department' help="Assigned to Departments" domain="[]" context="{'group_by': 'department_id'}"/>
+                    <filter string='Employee' help="Assigned to Employees" domain="[]" context="{'group_by': 'employee_id'}"/>
+                    <filter string='Vendor' domain="[]" context="{'group_by': 'partner_id'}"/>
                 </group>
             </search>
         </field>
@@ -464,7 +464,7 @@
             <search string="Search">
                 <field name="name" string="Category Name" filter_domain="[('name','ilike',self)]"/>
                 <group  expand='0' string='Group by...'>
-                    <filter string='Responsible' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'user_id'}"/>
+                    <filter string='Responsible' domain="[]" context="{'group_by' : 'user_id'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d298ccfe1ba..25a3dbc3d87 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -10,7 +10,7 @@
                    <field name="name" string="Appraisal Plans"/>
                    <field name="company_id" groups="base.group_multi_company"/>
                    <group expand="0" string="Group By" groups="base.group_multi_company">
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                </search>
             </field>
@@ -227,15 +227,15 @@
                     <field name="employee_id"/>
                     <field name="plan_id"/>
                     <field name="state"/>
-                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                    <filter string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                    <filter string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <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='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                        <filter string='Appraisals Month' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" help="Appraisals by Month" />
+                        <filter string='Employee' domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <filter string='Plan' domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='Status' domain="[]" context="{'group_by' : 'state'}" />
+                        <filter string='Appraisals Month' domain="[]" context="{'group_by' : 'date'}" help="Appraisals by Month" />
                    </group>
                </search>
             </field>
@@ -338,13 +338,13 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="deadline"/>
                     <field name="state"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                    <filter string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
-                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Interviewer" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Survey" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="Status" name="group_state" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index bc8b086fd40..dcf3eb4e81a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -172,10 +172,10 @@
                     <field name="amount_select"/>
                     <field name="slip_id"/>
                     <group col="8" colspan="4" expand="0" string="Group By">
-                        <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
-                        <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
-                        <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
-                        <filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                        <filter string="Salary Rule Category" name="category_id" context="{'group_by':'category_id'}"/>
+                        <filter string="Contribution Register" name="register_id" context="{'group_by':'register_id'}"/>
+                        <filter string="Amount Type" name="amount_select" context="{'group_by':'amount_select'}"/>
+                        <filter string="Employees" name="employee_id" context="{'group_by':'employee_id'}"/>
                     </group>
                 </search>
             </field>
@@ -353,15 +353,15 @@
                 <search string="Search Payslips">
                     <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
                     <field name="date_from"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
+                    <filter string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
+                    <filter string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                     <field name="employee_id"/>
                     <field name="payslip_run_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
-                        <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
-                        <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
-                        <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Employees" name="employee_id" context="{'group_by':'employee_id'}"/>
+                        <filter string="PaySlip Batch" name="payslip_run_id" context="{'group_by':'payslip_run_id'}"/>
+                        <filter string="Companies" name="company_id" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                        <filter string="States" name="state" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -642,7 +642,7 @@
                     <field name="category_id"/>
                     <field name="condition_range_min"/>
                     <group col="8" colspan="4" expand="0" string="Group By">
-                        <filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
+                        <filter string="Category" name="head" context="{'group_by':'category_id'}"/>
                     </group>
                 </search>
             </field>
@@ -677,8 +677,8 @@
                     <field name="name" string="Payslip Batches"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <filter string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter name="done_filter" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index cd3a3f0b91b..045540d5187 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -72,10 +72,10 @@
                     <field name="user_id"/>
                     <field name="account_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Timesheet Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Timesheet by Month"/>
+                        <filter string="Users" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Analytic account" domain="[]" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Timesheet Month" domain="[]" context="{'group_by':'date'}" help="Timesheet by Month"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 8ad54199fcc..deea835b456 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -63,8 +63,8 @@
                 <field name="arch" type="xml">
                     <xpath expr="//field[@name='account_id']" position="after">
                         <separator/>
-                        <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','!=',False)]" icon="terp-dolar"/>
-                        <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','!=',False)]" icon="terp-dolar"/>
+                        <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','!=',False)]"/>
+                        <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','!=',False)]"/>
                     </xpath>
                 </field>
             </record>
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 08597e60177..602cf029cea 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
@@ -38,7 +38,7 @@
             <field name="model">report.timesheet.line</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                    <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
+                    <filter string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
                     <field name="user_id"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
@@ -47,13 +47,13 @@
                         <field name="invoice_id"/>
                     </group>
                     <group expand="1" string="Group By">
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_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'}"/>
-                        <filter string="Day" icon="terp-go-today" 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':'name'}"/>
+                        <filter string="User" name="User" context="{'group_by':'user_id'}"/>
+                        <filter string="Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                        <filter string="Invoice" context="{'group_by':'invoice_id'}"/>
+                        <filter string="Day" context="{'group_by':'day'}"/>
+                        <filter string="Month" context="{'group_by':'month'}"/>
+                        <filter string="Year" context="{'group_by':'name'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4ee54fe1fdc..6348a056c28 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -207,7 +207,7 @@
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Employees" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                 </search>
diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
index eadc4559c2d..086dc12526b 100644
--- a/addons/l10n_be_coda/l10n_be_coda_view.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_view.xml
@@ -58,8 +58,8 @@
 			<field name="arch" type="xml">
 			<search string="Search Bank Transactions">
 				<field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
-				<filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-				<filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+				<filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" help="Debit Transactions."/>
+				<filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" help="Credit Transactions."/>
 				<field name="statement_id"/>
 				<group expand="0" string="Extended Filters...">
 					<field name="partner_id"/>
@@ -68,8 +68,8 @@
 				</group>
 				<newline/>
 				<group string="Group By" expand="0">
-					<filter string="Partner" context="{'group_by':'partner_id'}" icon="terp-folder-green"/>
-					<filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+					<filter string="Partner" context="{'group_by':'partner_id'}"/>
+					<filter string="Statement" context="{'group_by':'statement_id'}"/>
 				</group>
 			</search>
 			</field>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 822a442631f..3eeda971ca3 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -51,7 +51,7 @@
             <data>
                 <xpath expr="//field[@name='date_end']" position="after">
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches ready to be Adviced"/>
+                    <filter string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches ready to be Adviced"/>
                 </xpath>
             </data>
             </field>
@@ -134,8 +134,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payment advice">
                     <group>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
-                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
+                        <filter string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -145,11 +145,11 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By">
-                        <filter string="Bank" name="bank_id" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                        <filter string="Bank" name="bank_id" context="{'group_by':'bank_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Status" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Status" name="state" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Company" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                        <filter string="Company" name="company_id" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mail/views/mail_mail_views.xml b/addons/mail/views/mail_mail_views.xml
index 5dfd44e4d10..e459576741a 100644
--- a/addons/mail/views/mail_mail_views.xml
+++ b/addons/mail/views/mail_mail_views.xml
@@ -90,14 +90,14 @@
                 <search string="Email Search">
                     <field name="email_from" filter_domain="['|', '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
                     <field name="date"/>
-                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
-                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
+                    <filter name="received" string="Received" domain="[('state','=','received')]"/>
+                    <filter name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
+                    <filter name="sent" string="Sent" domain="[('state','=','sent')]"/>
+                    <filter name="exception" string="Failed" domain="[('state','=','exception')]"/>
                     <separator/>
-                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('message_type','=','email')]"/>
-                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('message_type','=','comment')]"/>
-                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('message_type','=','notification')]"/>
+                    <filter name="type_email" string="Email" domain="[('message_type','=','email')]"/>
+                    <filter name="type_comment" string="Comment" domain="[('message_type','=','comment')]"/>
+                    <filter name="type_notification" string="Notification" domain="[('message_type','=','notification')]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="author_id"/>
                         <field name="recipient_ids"/>
diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 131e646f396..8514dabe38e 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -115,8 +115,8 @@
                     <field name="lang"/>
                     <field name="model_id"/>
                     <group expand="0" string="Group by...">
-                        <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
-                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
+                        <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}"/>
+                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                </search>
            </field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 1254b11df6b..3f788d4d448 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -147,16 +147,16 @@
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
-                <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
-                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <filter string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                <filter string="Running" domain="[('state','=','running')]"/>
                 <separator/>
-                <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')]"/>
+                <filter string="Test Mode" name="test" domain="[('mode','=','test')]"/>
+                <filter string="Manual Mode" domain="[('mode','=','manual')]"/>
                 <field name="object_id" string="Resource"/>
                 <group expand="0" string="Group By">
-                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
-                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
-                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Resource" name="Object" context="{'group_by':'object_id'}"/>
+                    <filter string="Mode" name="Mode" context="{'group_by':'mode'}"/>
+                    <filter string="Status" name="Status" context="{'group_by':'state'}"/>
                 </group>
             </search>
         </field>
@@ -253,18 +253,18 @@
             <search string="Segments">
                 <field name="name" string="Segment"/>
                 <field name="date_run"/>
-                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
-                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <filter string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter string="Draft" domain="[('state','=','draft')]"/>
                 <separator/>
-                <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <filter string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+                <filter string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+                <filter string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                 <field name="campaign_id"/>
                 <field name="object_id"/>
                 <group expand="0" string="Group By">
-                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
-                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Launch Month" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
+                    <filter string="Campaign" name="Campaign" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Status" name="Status" context="{'group_by':'state'}"/>
+                    <filter string="Launch Month" name="Launch Date" context="{'group_by':'date_run'}"/>
                 </group>
             </search>
         </field>
@@ -434,21 +434,21 @@
             <search string="Marketing Campaign Activities">
                 <field name="res_name" string="Marketing Campaign Activity"/>
                 <field name="date"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                <filter string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                <filter string="Exception" domain="[('state','=','exception')]"/>
                 <field name="campaign_id"/>
                 <field name="segment_id"/>
                 <field name="object_id"/>
                 <field name="partner_id"/>
                 <field name="res_id"/>
                 <group expand="0" string="Group By">
-                    <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="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
-                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
-                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
-                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Execution Month" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                    <filter string="Campaign" name="campaign" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Segment" name="segment" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" context="{'group_by':'activity_id'}"/>
+                    <filter string="Resource" name="resource" context="{'group_by':'object_id'}"/>
+                    <filter string="Resource ID" name="res_id" context="{'group_by':'res_id'}"/>
+                    <filter string="Status" name="Status" context="{'group_by':'state'}"/>
+                    <filter string="Execution Month" name="Date" context="{'group_by':'date'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6a0bceddb60..879f2102ceb 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -13,11 +13,11 @@
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" string="Membership Product"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <filter string="Inactive" domain="[('active','=',0)]"/>
                     <field name="categ_id" operator="child_of"/>
                     <group  expand='0' string='Group by...'>
-                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
-                        <filter string='From Month' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}"/>
+                        <filter string='Category' domain="[]" context="{'group_by' : 'categ_id'}"/>
+                        <filter string='From Month' domain="[]" context="{'group_by' : 'membership_date_from'}"/>
                     </group>
                 </search>
             </field>
@@ -153,18 +153,18 @@
                     <field name="category_id"/>
                     <field name="membership_start" invisible="1"/>
                     <field name="membership_stop" string="End Membership Date"/>
-                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]"/>
+                    <filter string="Customers" name="customer" domain="[('customer','=',1)]"/>
                     <separator/>
-                    <filter string="Vendors" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]"/>
+                    <filter string="Vendors" name="supplier" domain="[('supplier','=',1)]"/>
                     <separator/>
-                    <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-                    <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <filter name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                    <filter name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
                     <group expand="0" string="Group By" colspan="10" col="8">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}"/>
-                        <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-                        <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-                        <filter string="Start Month" help="Starting Month Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-                        <filter string="End Month" help="Ending Month Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                        <filter string="Salesperson" domain="[]" context="{'group_by' : 'user_id'}"/>
+                        <filter string="Associate Member" name = "associate" domain="[]" context="{'group_by':'associate_member'}"/>
+                        <filter string=" Membership State" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <filter string="Start Month" help="Starting Month Of Membership" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Month" help="Ending Month Of Membership" domain="[]" context="{'group_by':'membership_stop'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dc4fd8547df..da07edfe5bf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -126,7 +126,7 @@
                     <field name="composition"/>
                     <field name="group_id" />
                     <group expand="0" string="Group By">
-                        <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                        <filter string="Property Group" domain="[]" context="{'group_by':'group_id'}"/>
                     </group>
                </search>
             </field>
@@ -222,10 +222,10 @@
                 <search string="Search for mrp workcenter">
                     <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                     <field name="resource_type"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                    <filter string="Inactive" domain="[('active','=',False)]"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -334,11 +334,11 @@
             <field name="arch" type="xml">
                 <search string="Work Order Operations">
                     <field name="name" string="Work Order Operations" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                    <filter string="Inactive" domain="[('active','=',False)]"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Production Location" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
             </field>
@@ -469,11 +469,11 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="categ_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_tmpl_id'}"/>
-                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
-                        <filter string="Work Order Operations" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
-                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
-                        <filter string=" Valid From Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Valid From Date by Month"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_tmpl_id'}"/>
+                        <filter string='Default Unit of Measure' domain="[]" context="{'group_by' : 'product_uom'}"/>
+                        <filter string="Work Order Operations" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string='Type' domain="[]" context="{'group_by' : 'type'}"/>
+                        <filter string=" Valid From Month" domain="[]" context="{'group_by':'date_start'}" help="Valid From Date by Month"/>
                         <filter string="Product Category" domain="[]" context="{'group_by':'categ_id'}"/>
                    </group>
                 </search>
@@ -552,12 +552,12 @@
                     <field name="bom_id"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Bill Of Material" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'bom_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
-                        <filter string="Work Order Operations" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
-                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
-                        <filter string=" Valid From Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Valid From Date by Month"/>
+                        <filter string="Bill Of Material" domain="[]" context="{'group_by':'bom_id'}"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string='Default Unit of Measure' domain="[]" context="{'group_by' : 'product_uom'}"/>
+                        <filter string="Work Order Operations" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string='Type' domain="[]" context="{'group_by' : 'type'}"/>
+                        <filter string=" Valid From Month" domain="[]" context="{'group_by':'date_start'}" help="Valid From Date by Month"/>
                    </group>
                 </search>
             </field>
@@ -856,24 +856,24 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                     <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]"
+                    <filter string="Pending" name="pending" domain="[('state','=','confirmed')]"
                         help="Manufacturing Orders which are waiting for raw materials."/>
-                    <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]"
+                    <filter string="Ready" name="ready" domain="[('state','=','ready')]"
                         help="Manufacturing Orders which are ready to start production."/>
-                    <filter icon="terp-check" string="In Production" name="inprogress" domain="[('state','=','in_production')]"
+                    <filter string="In Production" name="inprogress" domain="[('state','=','in_production')]"
                         help="Manufacturing Orders which are currently in production."/>
                     <separator/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                    <filter string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                         help="Production started late"/>
                     <field name="product_tmpl_id"/>
                     <field name="product_id"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="categ_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Work Order Operations" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Scheduled Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date by Month"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Work Order Operations" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Scheduled Month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date by Month"/>
                         <filter string="Product Category" domain="[]" context="{'group_by':'categ_id'}"/>
                     </group>
                </search>
@@ -1002,7 +1002,7 @@
              <field name="arch" type="xml">
                  <xpath expr="//filter[@name='consumable']" position="after">
                      <separator/>
-                    <filter string="Components" name="components" icon="terp-accessories-archiver" domain="[('bom_ids','not in',[])]"/>
+                    <filter string="Components" name="components" domain="[('bom_ids','not in',[])]"/>
                  </xpath>
              </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 850f80ed4d7..c4003111dab 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -122,19 +122,19 @@
                 <field name="name" string="Work Orders"/>
                 <field name="date_planned"/>
                 <field name="state"/>
-                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
-                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pause')]"/>
+                <filter string="Draft" domain="[('state','=','draft')]"/>
+                <filter string="In Progress" name="Current" domain="[('state','=','startworking')]"/>
+                <filter string="Pending" domain="[('state','=','pause')]"/>
                 <separator/>
-                <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                <filter string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                     help="Production started late"/>
                 <field name="workcenter_id"/>
                 <field name="production_id"/>
                 <group expand="0" string="Group By">
-                    <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
-                    <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Scheduled Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date by Month"/>
+                    <filter string="Work Center" domain="[]" context="{'group_by':'workcenter_id'}"/>
+                    <filter string="Production" domain="[]" context="{'group_by':'production_id'}"/>
+                    <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Scheduled Month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date by Month"/>
                 </group>
              </search>
         </field>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index d1d1b182c13..427a6b1c1aa 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -208,19 +208,19 @@
               <search string="Search Reair Orders">
                   <field name="name" string="Reair Orders"/>
                   <field name="state"/>
-                  <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
-                  <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
-                  <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                  <filter string="Quotations" domain="[('state','=','draft')]"/>
+                  <filter string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
+                  <filter string="Ready To Repair" domain="[('state','=','ready')]"/>
                   <separator/>
-                  <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
+                  <filter string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <field name="product_id"/>
                   <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                   <group expand="0" string="Group By">
-                      <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                      <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                      <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Guarantee limit Month" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit by Month"/>
-                      <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                      <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                      <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                      <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                      <filter string="Guarantee limit Month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit by Month"/>
+                      <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                   </group>
               </search>
           </field>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index aedd64a676e..97d6a0fec3a 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -133,7 +133,7 @@
           <filter name="open_true" string="Active" domain="[('open', '=', True)]"/>
           <filter name="open_false" string="Archive" domain="[('open', '=', False)]"/>
           <group expand="0" string="Group By">
-            <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
+            <filter string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
           </group>
         </search>
       </field>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1a70cccb767..b77e8980305 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -145,16 +145,16 @@
                     <field name="name" string="Sales Order"/>
                     <field name="date_order"/>
                     <field name="pos_reference"/>
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
-                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <filter string="New" domain="[('state','=','draft')]"/>
+                    <filter string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
+                    <filter string="Invoiced" domain="[('state','=','invoiced')]"/>
+                    <filter string="Posted" domain="[('state','=','done')]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Customer" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                 </search>
             </field>
@@ -882,7 +882,7 @@
                     <field name="config_id" />
                     <field name="user_id" />
                     <group expand="0" string="Group By">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="User" domain="[]" context="{'group_by' : 'user_id'}" />
                         <filter string="Point of Sale" domain="[]" context="{'group_by': 'user_id'}" />
                     </group>
                 </search>
@@ -926,18 +926,18 @@
                 <search string="Search Sales Order">
                     <field name="name"/>
                     <field name="date_order"/>
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
-                    <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
+                    <filter string="New" domain="[('state','=','draft')]"/>
+                    <filter string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
+                    <filter string="Invoiced" domain="[('state','=','invoiced')]"/>
+                    <filter string="Posted" domain="[('state','=','done')]"/>
                     <field name="user_id"/>
                     <field name="session_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Customer" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Session" domain="[]" context="{'group_by':'session_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 350df7898b5..636d8fa2fc4 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -117,15 +117,15 @@
                 <search string="Search Procurement">
                     <field name="origin" string="Procurement"/>
                     <field name="date_planned"/>
-                    <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
+                    <filter string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                     <separator/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', '=', 'confirmed')]" help="Procurement started late" />
+                    <filter string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', '=', 'confirmed')]" help="Procurement started late" />
                     <field name="product_id" />
                     <field name="state" />
                     <group expand="0" string="Group By">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Scheduled Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Scheduled Month" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 81a7b47329a..19f5d1c24d9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -12,17 +12,17 @@
                 <search string="Product">
                     <field name="name" string="Product" filter_domain="['|',('default_code','ilike',self),('name','ilike',self)]"/>
                     <filter string="Services" name="services" domain="[('type','=','service')]"/>
-                    <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
+                    <filter string="Consumable" name="consumable" domain="[('type','=','consu')]" help="Consumable products"/>
                     <separator/>
-                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                    <filter string="Can be Sold" name="filter_to_sell" domain="[('sale_ok','=',1)]"/>
                     <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                     <field string="Product Variant" name="product_variant_ids" filter_domain="['|', ('product_variant_ids.name','ilike',self), ('product_variant_ids.attribute_value_ids.attribute_id.name','ilike',self)]" groups="product.group_product_variant"/>
                     <field name="company_id"/>
                     <field name="pricelist_id" widget="selection" context="{'pricelist': self}" filter_domain="[]" groups="product.group_sale_pricelist"/> <!-- Keep widget=selection on this field to pass numeric `self` value, which is not the case for regular m2o widgets! -->
                     <group expand='0' name="group_by" string='Group by...'>
                        <filter string='Category' domain="[]" context="{'group_by' : 'categ_id'}"/>
-                       <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}"/>
-                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
+                       <filter string='Default Unit of Measure' domain="[]" context="{'group_by' : 'uom_id'}"/>
+                       <filter string='Type' domain="[]" context="{'group_by' : 'type'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9d48d0facbb..b20fb81de1a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -314,9 +314,9 @@
                     <separator/>
                     <filter name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
                     <group expand="0" string="Group By">
-                        <filter string="Vendor" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                        <filter string="Vendor" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Order Date" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Date" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
                     </group>
                 </search>
             </field>
@@ -340,9 +340,9 @@
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Vendor" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Order Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Expected Month" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                        <filter string="Vendor" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Order Month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Expected Month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
                     </group>
                 </search>
             </field>
@@ -567,10 +567,10 @@
                     <field name="partner_id" string="Vendor" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <filter name="hide_cancelled" string="Hide cancelled lines" domain="[('state', '!=', 'cancel')]"/>
                     <group expand="0" string="Group By">
-                        <filter name="groupby_supplier" string="Vendor" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
-                        <filter name="groupby_product" string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
-                        <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <filter name="groupby_supplier" string="Vendor" domain="[]" context="{'group_by' : 'partner_id'}" />
+                        <filter name="groupby_product" string="Product" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by' : 'state'}" />
                     </group>
                 </search>
             </field>
@@ -647,7 +647,7 @@
             <field name="inherit_id" ref="product.product_template_search_view"/>
             <field name="arch" type="xml">
                 <filter name="filter_to_sell" position="after">
-                   <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
+                   <filter name="filter_to_purchase" string="Can be Purchased" domain="[('purchase_ok', '=', 1)]"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml
index 8a22c3be868..84d7331380a 100644
--- a/addons/purchase_double_validation/purchase_double_validation_view.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_view.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='draft']" position="after">
-                <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
+                <filter name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
             </xpath>
         </field>
     </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index bf46a3924cc..f1018eb3c09 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -19,7 +19,7 @@
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
             <xpath expr="//filter[@name='approved']" position="after">
-                <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
+                <filter string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>
@@ -145,18 +145,18 @@
                 <search string="Search Call for Tenders">
                     <field name="name" string="Call for Tenders"/>
                     <field name="exclusive" />
-                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Call for Tenders"/>
-                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','in_progress')]" help="Call for Tenders in negotiation"/>
-                    <filter icon="terp-dialog-close" string="Closed Tenders" domain="[('state','=','open')]" help="Call for Tenders where tenders are closed"/>
+                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Call for Tenders"/>
+                    <filter string="Confirmed" domain="[('state','=','in_progress')]" help="Call for Tenders in negotiation"/>
+                    <filter string="Closed Tenders" domain="[('state','=','open')]" help="Call for Tenders where tenders are closed"/>
                     <separator/>
-                    <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
+                    <filter string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <field name="user_id" />
                     <group expand="0" string="Group By">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Ordering Date" icon="terp-go-month" domain="[]" context="{'group_by':'ordering_date'}"/>
-                        <filter string="End Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="Responsible" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Source" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Ordering Date" domain="[]" context="{'group_by':'ordering_date'}"/>
+                        <filter string="End Month" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 6ee4497c6be..3e88a5cb343 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,14 +11,14 @@
                 <search string="Search Resource">
                    <field name="name" string="Resource"/>
                    <field name="resource_type"/>
-                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+                   <filter string="Inactive" domain="[('active','=',False)]"/>
                    <field name="user_id" string="User"/>
                    <field name="company_id" groups="base.group_multi_company"/>
                    <group expand="0" string="Group By">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Working Period" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
+                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Working Period" domain="[]" context="{'group_by':'calendar_id'}"/>
                     </group>
                </search>
             </field>
@@ -46,9 +46,9 @@
                     <field name="company_id" string="Company" groups="base.group_multi_company"/>
                     <field name="calendar_id" string="Working Period"/>
                     <group expand="0" string="Group By">
-                        <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Leave Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave by Month"/>
+                        <filter string="Resource" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Leave Month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave by Month"/>
                     </group>
                </search>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6b7a01ef3f1..6c4e6500122 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -508,20 +508,20 @@
             <field name="model">sale.order.line</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sales Order Lines ready to be invoiced"/>
+                    <filter string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sales Order Lines ready to be invoiced"/>
                     <separator/>
                     <filter string="Confirmed" domain="[('state', 'in', ['confirmed', 'done'])]" name="confirmed"/>
                     <separator/>
-                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
+                    <filter string="My Sales Order Lines" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
                     <field name="order_partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="Salesperson" domain="[]" context="{'group_by':'salesman_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -532,21 +532,21 @@
             <field name="model">sale.order.line</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sales order lines, not yet delivered"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sales order lines done"/>
-                    <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sales Order Lines that are in 'done' state"/>
+                    <filter string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sales order lines, not yet delivered"/>
+                    <filter string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sales order lines done"/>
+                    <filter string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sales Order Lines that are in 'done' state"/>
                     <separator/>
-                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sales Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <filter string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sales Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
                     <separator/>
-                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
+                    <filter string="My Sales Order Lines" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <field name="order_id"/>
                     <field name="order_partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
index 34b3ae5d8c8..0ef9e9df3a6 100644
--- a/addons/sale_stock/report/sale_report_view.xml
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <filter name="Sales" position="after">
                     <separator/>
-                    <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/>
+                    <filter string="Picked" domain="[('shipped','=',True)]"/>
                 </filter>
                 <xpath expr="//group/filter[@name='status']" position="after">
                     <filter string="Warehouse" context="{'group_by':'warehouse_id'}"/>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index eaddc352827..553a6bfec02 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -132,7 +132,7 @@
             <field name="inherit_id" ref="stock.view_picking_internal_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='partner_id']" position="before">
-                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <filter string="To Invoice" name="to_invoice" domain="[('invoice_state', '=', '2binvoiced')]"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index e7a8ec5997e..80ecfcc1842 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -92,7 +92,7 @@
                     <filter name="virtual_stock_negative" string="Forecast Negative Stock" domain="[('virtual_available','&lt;',0)]"/>
                 </field>
                 <filter name="consumable" position="before">
-                   <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products"/>
+                   <filter string="Products" domain="[('type','=','product')]" help="Stockable products"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 4c52c03720c..ed0db17188c 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -21,11 +21,11 @@
             <field name="arch" type="xml">
                 <search string="Dates of Inventories &amp; Moves">
                     <field name="date"/>
-                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/>
-                    <filter icon="terp-accessories-archiver" string="Consumable" domain="[('product_id.type','=', 'consu')]"/>
+                    <filter name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/>
+                    <filter string="Consumable" domain="[('product_id.type','=', 'consu')]"/>
                     <separator/>
-                    <filter icon="terp-accessories-archiver-minus" string="No Inventory yet" domain="[('date','=', False)]"/>
-                    <filter icon="terp-accessories-archiver-minus" string="No Stock Move yet" domain="[('move_date','=', False)]"/>
+                    <filter string="No Inventory yet" domain="[('date','=', False)]"/>
+                    <filter string="No Stock Move yet" domain="[('move_date','=', False)]"/>
                     <field name="product_id"/>
                 </search>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3d0d3e41c65..18349e2cab5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -67,8 +67,8 @@
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Inventories Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Month"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Inventories Month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Month"/>
                     </group>
                 </search>
 
@@ -245,7 +245,7 @@
                     <field name="name" string="Product Lots" filter_domain="['|',('name','ilike',self),('ref','ilike',self)]"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -362,9 +362,9 @@
             <field name="arch" type="xml">
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
-                    <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
-                    <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
-                    <filter icon="terp-personal" name="supplier" string="Vendor" domain="[('usage', '=', 'supplier')]" help="Vendor Locations"/>
+                    <filter name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/>
+                    <filter name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/>
+                    <filter name="supplier" string="Vendor" domain="[('usage', '=', 'supplier')]" help="Vendor Locations"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -839,11 +839,11 @@
             <field name="arch" type="xml">
                 <search string="Picking Lists">
                     <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <filter icon="terp-check" name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Moves"/>
-                    <filter icon="terp-check" name="available" string="Ready" domain="[('state','in',('assigned', 'partially_available'))]" help="Assigned Moves"/>
-                    <filter icon="terp-check" name="waiting" string="Waiting Availability" domain="[('state','in', ('confirmed', 'waiting'))]" help="Waiting Moves"/>
-                    <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','in', ('confirmed', 'waiting', 'assigned'))]" help="Confirmed Moves"/>
-                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Moves"/>
+                    <filter name="available" string="Ready" domain="[('state','in',('assigned', 'partially_available'))]" help="Assigned Moves"/>
+                    <filter name="waiting" string="Waiting Availability" domain="[('state','in', ('confirmed', 'waiting'))]" help="Waiting Moves"/>
+                    <filter name="confirmed" string="Confirmed" domain="[('state','in', ('confirmed', 'waiting', 'assigned'))]" help="Confirmed Moves"/>
+                    <filter name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                     <separator/>
                     <filter name="late" string="Late" domain="[('min_date','&lt;', time.strftime('%%Y-%%m-%%d %%H:%%M:%%S'))]" help="Pickings that are late on scheduled time"/>
                     <separator/>
@@ -853,9 +853,9 @@
                     <field name="picking_type_id"/>
                     <field name="group_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" domain="[]" context="{'group_by':'origin'}"/>
                         <filter name="picking_type" string="Picking Type" domain="[]" context="{'group_by':'picking_type_id'}"/>
                         <filter string="Procurement Group" domain="[]" context="{'group_by':'group_id'}"/>
@@ -1313,22 +1313,22 @@
                     <field name="origin" filter_domain="['|', '|', ('origin', 'ilike', self), ('name', 'ilike', self), ('picking_id', 'ilike', self)]" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
 
-                    <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
-                    <filter icon="terp-stock" string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
-                    <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
+                    <filter string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
+                    <filter string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <filter string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
                     <filter string="Today" domain="[('date','&lt;=', datetime.datetime.combine(context_today(), datetime.time(23,59,59))), ('date','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Orders processed Today or planned for Today"/>
                     <field name="product_id"/>
                     <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                     <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
-                        <filter string="Source" name="groupby_location_id" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}" groups="stock.group_locations"/>
-                        <filter string="Destination" name="groupby_dest_location_id" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}" groups="stock.group_locations"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                        <filter string="Scheduled" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date_expected'}"/>
+                        <filter string="Product" name="by_product" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Picking" name="groupby_picking_id" domain="[]"  context="{'group_by':'picking_id'}"/>
+                        <filter string="Source" name="groupby_location_id" domain="[]" context="{'group_by':'location_id'}" groups="stock.group_locations"/>
+                        <filter string="Destination" name="groupby_dest_location_id" domain="[]" context="{'group_by':'location_dest_id'}" groups="stock.group_locations"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Creation" name="groupby_create_date" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Scheduled" name="groupby_date" domain="[]" context="{'group_by':'date_expected'}"/>
                     </group>
                 </search>
             </field>
@@ -1671,8 +1671,8 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Warehouse" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1851,10 +1851,10 @@
                        <filter name="productgroup" string='Product' context="{'group_by' : 'product_id'}"/>
                        <filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/>
                        <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_production_lot"/>
-                       <filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
-                       <filter string='Package' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
-                       <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
-                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
+                       <filter name="locationgroup" string='Location' domain="[]" context="{'group_by' : 'location_id'}"/>
+                       <filter string='Package' domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
+                       <filter string='Packaging' domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
+                       <filter string='Company' domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
                 </search>
             </field>
@@ -2059,9 +2059,9 @@
                     <field name="location_id"/>
                     <field name="packaging_id"/>
                     <group  expand='0' string='Group by...'>
-                       <filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
-                       <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_id'}"/>
-                       <filter string='Company' icon="terp-go-home" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
+                       <filter string='Location' domain="[]" context="{'group_by' : 'location_id'}"/>
+                       <filter string='Packaging' domain="[]" context="{'group_by' : 'packaging_id'}"/>
+                       <filter string='Company' domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                    </group>
                 </search>
             </field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 7ee225805bb..dccd35b4cac 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -67,15 +67,14 @@
                 <search string="Search Subscription">
                     <field name="name" string="Subscription"/>
                     <field name="date_init"/>
-                    <filter icon="terp-check"
-                            string="Running"
+                    <filter string="Running"
                             domain="[('state','=','running')]"/>
                     <field name="user_id"/>
                     <field name="partner_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="User" name="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 6c223b13a45..271a4398906 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -1162,10 +1162,6 @@ Possible children elements of the search view are:
         tooltip
     ``groups``
         makes a filter only available to specific users
-    ``icon``
-        an icon to display next to the label, if there's sufficient space
-
-        .. deprecated:: 7.0
 
     .. tip::
 
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index f13efa48e9d..5bf414a48d0 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -225,7 +225,7 @@
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
                     <field name="view_type"/>
                     <group expand="0" string="Group By" colspan="4">
-                        <filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
+                        <filter string="View Type" domain="[]" context="{'group_by':'view_type'}"/>
                     </group>
                 </search>
             </field>
@@ -556,7 +556,7 @@
             <field name="name">ir.actions.todo.select</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
-                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
+                    <filter string="To Do" name="todo" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
                     <field name="action_id"/>
                     <field name="state"/>
                 </search>
diff --git a/openerp/addons/base/ir/ir_attachment_view.xml b/openerp/addons/base/ir/ir_attachment_view.xml
index 403c0a84515..cba23a7224e 100644
--- a/openerp/addons/base/ir/ir_attachment_view.xml
+++ b/openerp/addons/base/ir/ir_attachment_view.xml
@@ -64,25 +64,20 @@
                 <search string="Attachments">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
                     <field name="create_date"/>
-                    <filter icon="terp-stage"
-                        string="URL"
-                        domain="[('type','=','url')]"/>
-                    <filter icon="terp-stock_align_left_24"
-                        string="Binary"
-                        domain="[('type','=','binary')]"/>
+                    <filter string="URL" domain="[('type','=','url')]"/>
+                    <filter string="Binary" domain="[('type','=','binary')]"/>
                     <separator/>
                     <filter name="my_documents_filter"
                         string="My Document(s)"
-                        icon="terp-personal"
                         domain="[('create_uid','=',uid)]"
                         help="Filter on my documents"/>
                     <field name="create_uid"/>
                     <field name="type"/>
                     <group expand="0" string="Group By">
-                        <filter name="owner" string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
-                        <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter name="owner" string="Owner" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Creation Month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/openerp/addons/base/ir/ir_cron_view.xml b/openerp/addons/base/ir/ir_cron_view.xml
index 91b164f994a..0159aba007f 100644
--- a/openerp/addons/base/ir/ir_cron_view.xml
+++ b/openerp/addons/base/ir/ir_cron_view.xml
@@ -71,9 +71,8 @@
                     <field name="nextcall"/>
                     <field name="active"/>
                     <group expand="0" string="Group By">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Execution" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'nextcall'}" />
+                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Execution" domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
             </field>
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
index a62b8518eda..4ae1dd85b34 100644
--- a/openerp/addons/base/ir/ir_model_view.xml
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -131,16 +131,10 @@
             <field name="arch" type="xml">
                 <search string="Model Description">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
-                    <filter icon="terp-camera_test"
-                        string="Transient"
-                        domain="[('transient', '=', True)]"/>
+                    <filter string="Transient" domain="[('transient', '=', True)]"/>
                     <separator/>
-                    <filter icon="terp-stock_align_left_24"
-                        string="Custom"
-                        domain="[('state', '=', 'manual')]"/>
-                    <filter icon="terp-translate"
-                        string="Base"
-                        domain="[('state', '=', 'base')]"/>
+                    <filter string="Custom" domain="[('state', '=', 'manual')]"/>
+                    <filter string="Base" domain="[('state', '=', 'base')]"/>
                 </search>
             </field>
         </record>
@@ -212,30 +206,20 @@
             <field name="arch" type="xml">
                 <search string="Fields">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+"
-                        string="Required"
-                        domain="[('required', '=', True)]"/>
+                    <filter string="Required" domain="[('required', '=', True)]"/>
                     <separator/>
-                    <filter icon="terp-dialog-close"
-                        string="Readonly"
-                        domain="[('readonly', '=', True)]"/>
+                    <filter string="Readonly" domain="[('readonly', '=', True)]"/>
                     <separator/>
-                    <filter 
-                        string="Custom"
-                        domain="[('state', '=', 'manual')]"/>
-                    <filter 
-                        string="Base"
-                        domain="[('state', '=', 'base')]"/>
+                    <filter string="Custom" domain="[('state', '=', 'manual')]"/>
+                    <filter string="Base" domain="[('state', '=', 'base')]"/>
                     <separator/>
-                    <filter icon="terp-translate"
-                        string="Translate"
-                        domain="[('translate', '=', True)]"/>
+                    <filter string="Translate" domain="[('translate', '=', True)]"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
                     <group expand="0" string="Group By">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Object" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                 </search>
             </field>
@@ -297,8 +281,8 @@
                     <field name="res_id"/>
                     <field name="noupdate"/>
                     <group expand="0" string="Group By">
-                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -426,16 +410,16 @@
             <field name="arch" type="xml">
                 <search string="Access Controls">
                     <field name="name" string="Access Control"/>
-                    <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                    <filter string="Global" domain="[('group_id','=',False)]"/>
                     <separator/>
-                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                    <filter string="Full Access" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access" domain="[('perm_write','=',True)]"/>
                     <field name="model_id"/>
                     <field name="group_id"/>
                     <group expand="0" string="Group By" colspan="11" col="11" groups="base.group_no_one">
-                        <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Group" domain="[]" context="{'group_by':'group_id'}"/>
+                        <filter string="Object" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/openerp/addons/base/ir/ir_rule_view.xml b/openerp/addons/base/ir/ir_rule_view.xml
index fa82840c064..10267e2cb75 100644
--- a/openerp/addons/base/ir/ir_rule_view.xml
+++ b/openerp/addons/base/ir/ir_rule_view.xml
@@ -64,7 +64,7 @@
             <field name="arch" type="xml">
                 <search string="Record Rules">
                     <field name="name" string="Record Rule"/>
-                    <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                    <filter string="Global" domain="[('global','=',True)]"/>
                     <separator/>
                     <filter string="Full Access Right" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
                     <filter string="Read Access Right" domain="[('perm_read','=',True)]"/>
diff --git a/openerp/addons/base/ir/ir_translation_view.xml b/openerp/addons/base/ir/ir_translation_view.xml
index 6bf3d783040..e96b7dbb697 100644
--- a/openerp/addons/base/ir/ir_translation_view.xml
+++ b/openerp/addons/base/ir/ir_translation_view.xml
@@ -6,8 +6,7 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-gdu-smart-failing"
-                        string="Untranslated"
+                    <filter string="Untranslated"
                         domain="['|','|',('state','=','to_translate'),('value', '=', False),('value','=','')]"/>
                     <filter name="openerp-web"
                         string="Web-only translations"
diff --git a/openerp/addons/base/ir/ir_values_view.xml b/openerp/addons/base/ir/ir_values_view.xml
index f660a856fca..1464b077962 100644
--- a/openerp/addons/base/ir/ir_values_view.xml
+++ b/openerp/addons/base/ir/ir_values_view.xml
@@ -68,8 +68,8 @@
                         filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
                         string="Client Action"/>
                     <group expand="0" string="Group By">
-                        <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
+                        <filter string="Model" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Type" domain="[]" context="{'group_by':'key2'}"/>
                     </group>
                 </search>
             </field>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 97afe1aafda..bfa422cb87f 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
                 <search string="Parameters">
                     <field name="name" string="Name"/>
-                    <filter icon="terp-project"
-                        string="Generic"
+                    <filter string="Generic"
                         help="Parameters that are used by all resources."
                         domain="[('res_id','=',False)]"/>
                     <field name="fields_id"/>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index a45cd457f63..8ed11eb2da1 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -157,7 +157,7 @@
             <field name="arch" type="xml">
                 <search string="Bank Accounts">
                     <field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
-                    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
+                    <filter name="my_bank" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
                 </search>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index 6b3b0e3b858..4c2a203ac13 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -95,7 +95,7 @@
                     <field name="name"
                         filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
                         string="Language"/>
-                    <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+                    <filter string="Translatable" domain="[('translatable','=',True)]"/>
                     <field name="direction"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 1a2788c191f..3ae8c2903ab 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -327,7 +327,7 @@
                 <search string="Search Partner">
                    <field name="name"
                        filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/>
-                   <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+                   <filter help="My Partners" domain="[('user_id','=',uid)]"/>
                    <separator/>
                    <filter string="Persons" name="type_person" domain="[('is_company','=',0)]"/>
                    <filter string="Companies" name="type_company" domain="[('is_company','=',1)]"/>
@@ -339,7 +339,7 @@
                    <field name="user_id"/>
                    <field name="parent_id" domain="[('is_company','=',1)]" operator="child_of"/>
                    <group expand="0" name="group_by" string="Group By">
-                       <filter name="salesperson" string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                       <filter name="salesperson" string="Salesperson" domain="[]" context="{'group_by' : 'user_id'}" />
                        <filter string="Company" context="{'group_by': 'parent_id'}"/>
                        <filter string="Country" context="{'group_by': 'country_id'}"/>
                    </group>
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index e1696ce1a52..3eee1860024 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -765,7 +765,6 @@
             <rng:optional><rng:attribute name="invisible"/></rng:optional>
             <rng:optional><rng:attribute name="name" /></rng:optional>
             <rng:optional><rng:attribute name="separator" /></rng:optional>
-            <rng:optional><rng:attribute name="icon" /></rng:optional>
             <rng:optional><rng:attribute name="string" /></rng:optional>
             <rng:optional><rng:attribute name="type" /></rng:optional>
             <rng:optional><rng:attribute name="align" /></rng:optional>
diff --git a/openerp/addons/base/workflow/workflow_view.xml b/openerp/addons/base/workflow/workflow_view.xml
index f67e3996feb..a968ae0c756 100644
--- a/openerp/addons/base/workflow/workflow_view.xml
+++ b/openerp/addons/base/workflow/workflow_view.xml
@@ -160,15 +160,13 @@
         <field name="arch" type="xml">
             <search string="Workflow Activity">
                 <field name="name" string="Workflow Activity"/>
-                <filter icon="terp-camera_test" string="Flow Start"
-                domain="[('flow_start', '=',True)]" />
-                <filter icon="terp-gtk-stop" string="Flow Stop"
-                domain="[('flow_stop', '=',True)]" />
+                <filter string="Flow Start" domain="[('flow_start', '=',True)]"/>
+                <filter string="Flow Stop" domain="[('flow_stop', '=',True)]"/>
                 <field name="wkf_id"/>
                 <field name="action_id"/>
                 <field name="kind"/>
                 <group expand="0" string="Group By">
-                    <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
+                    <filter string="Workflow" domain="[]" context="{'group_by':'wkf_id'}"/>
                 </group>
             </search>
         </field>
@@ -289,7 +287,7 @@
         <field name="arch" type="xml">
             <search string="Workflow Instances">
                 <field name="res_type" string="Resource Object"/>
-                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
+                <filter string="Active" domain="[('state','=','active')]" name="active"/>
                 <field name="wkf_id"/>
                 <field name="res_id"/>
                 <field name="state"/>
@@ -349,7 +347,7 @@
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
                 <field name="state" string="Status"/>
-                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+                <filter string="Active" name="active" domain="[('state','=','active')]"/>
                 <field name="wkf_id"/>
                 <field name="act_id"/>
                 <field name="subflow_id"/>