diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 00dec853486..b48ccc55daa 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -178,12 +178,33 @@
             </field>
         </record>
 
+        <record id="view_crossovered_budget_search" model="ir.ui.view">
+           <field name="name">crossovered.budget.search</field>
+           <field name="model">crossovered.budget</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Budget">
+                   <group col="20" colspan="4">
+                       <filter string="Draft" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="To Validate" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <separator orientation="vertical"/>
+                       <field name="name" select="1"/>
+                       <field name="code" select="1" />
+                       <field name="state"/>
+                       <field name="date_from"/>
+                       <field name="date_to"/>
+                   </group>
+               </search>
+           </field>
+        </record>
+
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
             <field name="name">Budget</field>
             <field name="res_model">crossovered.budget</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crossovered_budget_view_tree"/>
+            <field name="search_view_id" ref="view_crossovered_budget_search"/>
         </record>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a5afddc9823..fc5140c8303 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -137,15 +137,14 @@
 	     </record>
 
 		<!-- Calenadar's menu -->
-
-        <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="10" />
+          <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_config_address_book" sequence="15" />
 
 		<!-- Invitation menu -->
 
-		<menuitem id="menu_attendee_invitations"
-			name="Event Invitations" parent="base.menu_calendar_configuration"
-			sequence="10" action="action_view_attendee_form" />
+	       <menuitem id="menu_attendee_invitations"
+            name="Event Invitations" parent="base.menu_calendar_configuration"
+            sequence="10" action="action_view_attendee_form" />
 
 		<!--		ALARM FORM VIEW-->
 
@@ -192,11 +191,10 @@
 
 		<!--		Menu for Alarms-->
 
-        <menuitem id="menu_crm_meeting_avail_alarm"
+         <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
-
         <!-- Event Form View-->
 
 		<record model="ir.ui.view" id="event_form_view">
@@ -427,9 +425,9 @@
 
 		<!-- Event menu  -->
 
-		<menuitem id="menu_events"
-				name="Events" parent="base.menu_calendar_configuration"
-				sequence="5" action="action_view_event" />
+		  <menuitem id="menu_events"
+                name="Events" parent="base.menu_calendar_configuration"
+                sequence="5" action="action_view_event" />
 
      </data>
  </openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7b462646784..2b3f883024c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data>
 
+    <menuitem id="menu_config_claim" name="Claim"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="8" />
+
     <!-- Claims categories  -->
 
     <record id="crm_claim_categ_action" model="ir.actions.act_window">
@@ -13,8 +17,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_categ_action"
-        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+    <menuitem action="crm_claim_categ_action" name="Categories"
+        id="menu_crm_case_claim-act" parent="menu_config_claim" />
+
 
     <!-- Claim Stages -->
 
@@ -27,8 +32,8 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_stage_act"
-            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+     <menuitem action="crm_claim_stage_act" name="Stages"
+            id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
     <!-- Claim Resource Type -->
 
@@ -41,9 +46,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_resource_act"
+     <menuitem action="crm_claim_resource_act" name="Resource Type"
             id="menu_crm_claim_stage_act"
-            parent="crm.menu_crm_case_resource_type" />
+            parent="menu_config_claim" />
 
         <!-- Claims    -->
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 78123fd32b7..6853da7c89a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+           <!-- Fund Raising Configuration Menu -->
+        <menuitem id="menu_config_fundrising" name="Fund Raising"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="7" />
 
         <!-- Fund Raising Categories Form View -->
 
@@ -13,9 +17,9 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fund_categ_action"
+       <menuitem action="crm_fund_categ_action" name="Categories"
             id="menu_crm_case_fundraising-act" groups="base.group_extended"
-            parent="crm.menu_crm_case_categ" />
+            parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
 
@@ -28,10 +32,11 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended"
+         <menuitem action="crm_fundraising_stage_act"
+            groups="base.group_extended" name="Stages"
             id="menu_crm_fundraising_stage_act"
-            parent="crm.menu_crm_case_stage" />
+            parent="menu_config_fundrising" />
+
 
         <!-- Fund Resource Type Form View -->
 
@@ -44,10 +49,10 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended"
+       <menuitem action="crm_fundraising_resource_act"
+            groups="base.group_extended" name="Resource Type"
             id="menu_crm_fundraising_resource_act"
-            parent="crm.menu_crm_case_resource_type" />
+            parent="menu_config_fundrising" />
 
 
         <!-- Fund Raising Tree View -->
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4642f60e7e2..451f6c7119e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+       <!-- Helpdesk Support Categories Configuration Menu-->
+       <menuitem id="menu_config_helpdesk" name="Helpdesk"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="8" />
 
         <!-- Helpdesk Support Categories Form View -->
 
@@ -13,8 +17,8 @@
             <field name="context">{'object_id':'crm.helpdesk'}</field>
         </record>
 
-        <menuitem action="crm_helpdesk_categ_action"
-            id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_helpdesk_categ_action" name="Categories"
+            id="menu_crm_case_helpdesk-act" parent="menu_config_helpdesk" />
 
         <!--  Helpdesk Support Form View -->
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 040dff1ff38..eeb95d77fc1 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -15,9 +15,9 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="base.menu_crm_configuration" id="menu_segm_questionnaire"
-                  action="open_questionnaires" />
 
+        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_questionnaire"
+                  action="open_questionnaires" />
 
         <record model="ir.actions.act_window" id="open_questions">
           <field name="name">Questions</field>
@@ -25,7 +25,8 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="base.menu_crm_configuration" id="menu_segm_answer"
+
+        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_answer"
                   action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 277099aca02..65d5db06fe3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
 
+       <menuitem
+        id="menu_hr_config_applicant"
+        name="Applicant"
+        parent="hr.menu_hr_configuration"
+        />
+
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -25,7 +31,8 @@
         <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
         <field name="context">{'object_id':'hr.applicant'}</field>
     </record>
-    <menuitem action="hr_job_stage_act" id="menu_hr_job_stage_act" parent="crm.menu_crm_case_stage"/>
+
+    <menuitem action="hr_job_stage_act" id="menu_hr_job_stage_act" name="Stages" parent="menu_hr_config_applicant"/>
 
     # ------------------------------------------------------
     # Jobs
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 eccdb721de0..880e5837fd2 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
@@ -462,6 +462,7 @@
                    <newline/>
                    <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
                    		<filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index c7cf7b0495e..32e8bda4f7f 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -74,12 +74,12 @@
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>      
-                    <newline/>                        
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By...">
 	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
 	                    <separator orientation="vertical"/>
+	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
 	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
 	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
 	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
@@ -111,7 +111,7 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="general_account_id"/>
 	                    <field name="to_invoice" widget="selection"/>
-	                </group>                    
+	                </group>
                 </search>
             </field>
         </record>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 5cf35fa3420..611416055f7 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,32 +8,32 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-	                    <field name="name" required="1" select="1"/>
-	                    <field name="date" required="1" select="1"/>
-	                    <field name="user_id" string="Responsible" select="1"/>
-	                </group>	                
+                        <field name="name" required="1" select="1"/>
+                        <field name="date" required="1" select="1"/>
+                        <field name="user_id" string="Responsible" select="1"/>
+                    </group>
                     <notebook colspan="4">
-	                    <page string="Details">
-	                    	<group col="4" colspan="4">
-	                    		<separator string="Email Details" colspan="4"/>
-			                    <field name="email_from" />
-			                    <field name="email_to" />
-			                    <field name="email_cc" />
-			                    <field name="email_bcc" />
-			                    <field name="message_id" />
-			               </group>
-			               <separator string="Description" colspan="4"/>
+                        <page string="Details">
+                            <group col="4" colspan="4">
+                                <separator string="Email Details" colspan="4"/>
+                                <field name="email_from" />
+                                <field name="email_to" />
+                                <field name="email_cc" />
+                                <field name="email_bcc" />
+                                <field name="message_id" />
+                           </group>
+                           <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
-		                </page>
-		                <page string="Attachments">
-		                	<separator string="Attachments" colspan="4"/>
-		                    <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
-                 		</page>
-	                </notebook>
+                        </page>
+                        <page string="Attachments">
+                            <separator string="Attachments" colspan="4"/>
+                            <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_message_tree">
             <field name="name">mailgate.message.tree</field>
             <field name="model">mailgate.message</field>
@@ -41,12 +41,12 @@
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
                     <field name="date" />
-                    <field name="email_from" />                    
-                    <field name="user_id" />                    
+                    <field name="email_from" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_message_search">
             <field name="name">mailgate.message.search</field>
             <field name="model">mailgate.message</field>
@@ -56,11 +56,11 @@
                     <field name="name" />
                     <field name="date" />
                     <field name="user_id" />
-                    <field name="message_id" />                    
+                    <field name="message_id" />
                 </search>
             </field>
         </record>
-        
+
 
         <record model="ir.ui.view" id="view_mailgate_thread_form">
             <field name="name">mailgate.thread.form</field>
@@ -71,33 +71,33 @@
                     <field name="thread" select="1"/>
                     <separator string="Logs" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                    	<tree string="Mailgateway Logs">
-		                    <field name="name" select="1" />
-		                    <field name="date" />
-		                </tree>
-	                    <form string="Mailgate Logs">
-		                    <field name="name" />
-		                    <field name="date" />
-		                    <field name="user_id" />
-		                    <field name="message_id" />		                    
-		                    <notebook colspan="4">
-			                    <page string="Email Details">
-			                    	<group col="4" colspan="4">
-			                    		<separator string="Email Details" colspan="4"/>
-					                    <field name="email_from" />
-					                    <field name="email_to" />
-					                    <field name="email_cc" />
-					                    <field name="email_bcc" />
-					               </group>
-					               <separator string="Description" colspan="4"/>
+                        <tree string="Mailgateway Logs">
+                            <field name="name" select="1" />
+                            <field name="date" />
+                        </tree>
+                        <form string="Mailgate Logs">
+                            <field name="name" />
+                            <field name="date" />
+                            <field name="user_id" />
+                            <field name="message_id" />
+                            <notebook colspan="4">
+                                <page string="Email Details">
+                                    <group col="4" colspan="4">
+                                        <separator string="Email Details" colspan="4"/>
+                                        <field name="email_from" />
+                                        <field name="email_to" />
+                                        <field name="email_cc" />
+                                        <field name="email_bcc" />
+                                   </group>
+                                   <separator string="Description" colspan="4"/>
                                     <field name="description" nolabel="1" colspan="4" />
-				                </page>
-				                <page string="Attachments">
-				                	<separator string="Attachments" colspan="4"/>
-				                    <field name="attachment_ids" nolabel="1" colspan="4" />
-		                 		</page>
-			                </notebook>
-		                </form>
+                                </page>
+                                <page string="Attachments">
+                                    <separator string="Attachments" colspan="4"/>
+                                    <field name="attachment_ids" nolabel="1" colspan="4" />
+                                </page>
+                            </notebook>
+                        </form>
                     </field>
                     <separator string="Histories" colspan="4"/>
                     <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
@@ -131,7 +131,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_thread_tree">
             <field name="name">mailgate.thread.tree</field>
             <field name="model">mailgate.thread</field>
@@ -143,41 +143,41 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
-	        <field name="name">Mailgateway Threads</field>
-	        <field name="res_model">mailgate.thread</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="view_type">form</field>
-	        <field name="view_id" ref="view_mailgate_thread_tree"/>
-	    </record>
-		
-		<record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_mailgate_thread_tree"/>
-	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
-	    </record>
-	    <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="view_mailgate_thread_form"/>
-	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
-	    </record>
-		
-		
-		 <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
+            <field name="name">Mailgateway Threads</field>
+            <field name="res_model">mailgate.thread</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_mailgate_thread_form"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+
+
+         <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
             parent="base.menu_base_config" sequence="0"/>
 
         <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-        	parent="base.menu_crm_configuration"  sequence="20"/>
-        	-->
+            parent="base.menu_crm_configuration"  sequence="20"/>
+            -->
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
             res_model="mailgate.message"
             src_model="res.partner"
-            view_id="view_mailgate_message_tree"            
+            view_id="view_mailgate_message_tree"
             />
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15ed872391f..bcda66e8679 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -296,9 +296,9 @@
 	                    <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
+                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                    </group>
                 </search>
             </field>
@@ -655,21 +655,21 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-mrp" string="Draft"
+                       <filter icon="terp-document-new" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current" name="Current"
+                       <filter icon="terp-check" string="Current" name="Current"
                            default="1"
                            domain="[('state','in',('confirmed','ready','exception'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
-                       <filter icon="terp-mrp" string="Ready"
+                       <filter icon="terp-camera_test" string="Ready"
                            domain="[('state','=','ready')]"
                            help="Manufacturing Orders which are ready to produce" />
-                       <filter icon="terp-mrp" string="In Production"
+                       <filter icon="terp-check" string="In Production"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are in production" />
                        <separator orientation="vertical"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
@@ -679,12 +679,12 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
+                    <group expand="0" string="Group By" colspan="10" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 16a4e20aee5..99fd967b91d 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -60,9 +60,9 @@
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Production during last 7 days"/>
                       <separator orientation="vertical"/>
-                        <filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
-                        <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]"/>
-                        <filter icon="terp-mrp" string="Done" domain="[('state','=','done')]"/>
+                        <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
+                        <filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                       <separator orientation="vertical"/>
                         <field name="location_src_id" />
                         <field name="location_dest_id" />
@@ -70,25 +70,25 @@
                    <newline/>
 
                    <group expand="1" string="Group By...">
-                    	<filter string="Raw Material Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Finished Products Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
+                    	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
+                        <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
                     	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     	<separator orientation="vertical"/>
-                    	<filter string="Company" icon="terp-mrp" context="{'group_by':'company_id'}"/>
+                    	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-mrp" context="{'group_by':'day'}"/>
-                    	<filter string="Month" name="month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    	<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." groups="base.group_extended">
-	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
-	                    <filter icon="terp-mrp" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-	                    <filter icon="terp-mrp" string="Ready to Produce" domain="[('state','=','ready')]"/>
+	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
+	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
+	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
 	                    <separator orientation="vertical"/>
                       <field name="priority"/>
                       <separator orientation="vertical"/>
@@ -97,7 +97,7 @@
 	                    <field name="date_start"/>
                       <field name="date_planned"/>
                       <field name="date_finnished"/>
-	                </group>                   
+	                </group>
                   </search>
             </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 37e90a995b4..a5c6564644e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -96,10 +96,10 @@
                 		<field name="production_id"/>
                 	</group>
                 	<newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    <group expand="0" string="Group By" colspan="10" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 1defa214754..7345dc94f93 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -86,12 +86,12 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
-                       <filter icon="terp-mrp" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
+                       <filter icon="terp-gtk-go-back-rtl" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -100,11 +100,11 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
-                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-                    	<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -191,9 +191,9 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <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'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 47e80be3e31..4c655099386 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -183,10 +183,10 @@
                     <field name="product_id" />
               	</group>
               	<newline/>
-                  <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                      <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                      <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Partner" icon="terp-mrp" domain="[]" context="{'group_by':'partner_id'}"/>
+                  <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
+                      <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                      <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                      <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                   </group>
              </search>
           </field>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index ef8ae334810..62b15db0234 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -153,19 +153,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="Running" domain="[('state','in',('payment','advance'))]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index aa73cdd0e63..11ed4bfba65 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="40"/>
+
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
             <field name="model">product.product</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-                   <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
+                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
-                   <filter string="Can be sold" icon="terp-stock" domain="[('sale_ok','=',1)]"/>
-                   <filter string="Can be Purchased" icon="terp-stock" domain="[('purchase_ok', '=', 1)]" />
+                   <filter string="Can be sold" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <filter string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
                    <field name="default_code"/>
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
-                   <group  expand='1' string='Group by...' groups="base.group_extended">
-                       <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                   <group  expand='0' string='Group by...' groups="base.group_extended">
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
+                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                    <newline/>
                    <group expand="0" string="Extended options..." groups="base.group_extended">
@@ -260,7 +261,7 @@
         <menuitem action="product_category_action_form"
             groups="base.group_extended"
             id="menu_product_category_action_form"
-            parent="prod_config_main" sequence="60"/>
+            parent="prod_config_main" sequence="2"/>
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -374,7 +375,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
+            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f668d82bf5c..973194e0e31 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -256,5 +256,15 @@
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Latest in house tests</field>
         </record>
+        <record id="project_message_1" model="project.message">
+			<field name="date">2010-05-27</field>
+			<field name="project_id" ref="project.project_project_23"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="description">Follow the procedure of Configuration wizard.
+- Add all required modules
+- Add chat of accounts
+- Create Users</field>
+			<field name="subject">Configuration steps</field>
+		</record>
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d7a7ff0e8d4..e979632bab4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -93,7 +93,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree string="Projects">
+                <tree colors="blue:state in ('pending');black:state in ('open','template','close');gray:state in ('cancelled') " string="Projects">
                     <field name="complete_name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
@@ -111,22 +111,20 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Open" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
-                       <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
+                       <filter icon="terp-document-new" string="Draft" domain="[('state', 'in',('draft'))]" help="Draft Projects" default="1"/>
+                       <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
+                       <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
+                       <filter icon="terp-personal-" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
                       </group>
                </search>
             </field>
@@ -159,6 +157,7 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
+            <field name="context">{'search_default_Current':1}</field>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
@@ -169,8 +168,8 @@
             <field name="domain">[('state','=','template')]</field>
             <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem  id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>
-        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>
+<!--        <menuitem  id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>-->
+<!--        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>-->
 
         <record id="view_task_work_form" model="ir.ui.view">
             <field name="name">project.task.work.form</field>
@@ -213,7 +212,7 @@
                     <separator string="" colspan="4"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object" default_focus="1"/>
+                        <button icon="gtk-apply" name="compute_hours" string="Update" type="object" default_focus="1"/>
                     </group>
                 </form>
             </field>
@@ -277,7 +276,7 @@
                                 <button name="%(action_config_compute_remaining)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
+                                <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-apply"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -332,8 +331,8 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
-                    <field name="sequence" invisible="1"/>
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                    <field name="sequence" />
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
@@ -355,8 +354,8 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
+                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
@@ -409,30 +408,30 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter name="current" string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
+                        <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-emblem-important"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="group_user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" name="group_project_id" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
-                        <filter string="Stage" name="group_stage_id" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="State" name="group_state" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-project" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
@@ -591,10 +590,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
+                    <field name="date" select="1"/>
                     <field name="subject" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
                 </tree>
             </field>
        </record>
@@ -606,8 +605,8 @@
            <field name="arch" type="xml">
                <search string="Messages">
                    <group col="20" colspan="4">
-                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
-                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
+                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-go-month" string="This Month" />
+                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-go-today" string="Today" />
 	                   <separator orientation="vertical"/>
 	                   <field name="subject"/>
 	                   <field name="project_id" select="1" widget="selection"/>
@@ -615,10 +614,10 @@
 	                   </field>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
-                       <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                       <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                       <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                    </group>
                </search>
            </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 66321d54223..a94ffac39d9 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -61,46 +61,46 @@
 	                    <filter icon="gtk-media-rewind" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="gtk-media-rewind" string="   30 Days   "
+	                    <filter icon="terp-go-month" string="   30 Days   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Tasks performed in last 30 days"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Tasks during last 7 days"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
-	                    		icon="terp-project"
+	                    		icon="terp-document-new"
 	                    		domain="[('state','=','draft')]"
 	                    		help = "Draft tasks"/>
 		                <filter string="Current"
-		                		icon="terp-project"
+		                		icon="terp-check"
 		                		domain="[('state', '=' ,'open')]"
 		                		help = "In progress tasks"/>
 	                   	<filter string="Pending"
-	                   			icon="terp-project"
+	                   			icon="terp-gtk-media-pause"
 	                   			domain="[('state','=','pending')]"
 	                   			help = "Pending tasks"/>
                       	<filter string="Done"
-                    			icon="terp-project"
+                    			icon="terp-dialog-close"
                     			name="done"
                     			domain="[('state','=','done')]"/>
 	  					<separator orientation="vertical"/>
 	  					<field name="partner_id" />
 	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-personal"
 	                        		string="My Task"
 	                        		help = "My tasks"
 	                        		domain="[('user_id','=',uid)]" />
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-personal-"
 	                        		string="Non Assigned Tasks to users"
 	                        		help="Non Assigned Tasks to users"
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="project_id">
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
 	                        		help="My Projects"
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
@@ -108,20 +108,20 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
-                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
+                        <filter string="Project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
-                        <filter string="Done By" icon="terp-project" context="{'group_by':'done_by'}" />
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
+                        <filter string="Done By" icon="terp-personal" context="{'group_by':'done_by'}" />
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
-                        <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Stage" icon="terp-stage" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 059c19e0f40..d680e533505 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -120,8 +120,8 @@ project_gtd_timebox()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'timebox_id': fields.many2one('project.gtd.timebox', "Timebox"),
-        'context_id': fields.many2one('project.gtd.context', "Context"),
+        'timebox_id': fields.many2one('project.gtd.timebox', "Timebox",help="Time-laps during which task has to be treated"),
+        'context_id': fields.many2one('project.gtd.context', "Context",help="The context place where user has to treat task"),
      }
 
     def copy_data(self, cr, uid, id, default=None, context=None):
@@ -169,7 +169,7 @@ class project_task(osv.osv):
         timebox_obj = self.pool.get('project.gtd.timebox')
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
-            search_extended ='''<newline/><group col="%d" expand="1" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
+            search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
             search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<filter domain="[('state', 'in', ('draft','open','pending'))]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('All'),)
             search_extended += '''<separator orientation="vertical"/>'''
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 1615319c7b9..64f6bcdfbd1 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -8,7 +8,8 @@
         <field name="arch" type="xml">
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
-                <field name="name"/>
+                <field name="name" select="1"/>
+                <field name="project_default_id" select="1"/>
             </tree>
         </field>
     </record>
@@ -75,7 +76,7 @@
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
             <field name="remaining_hours" position="after">
-                <field string="xxxxxx" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
+                <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
                 <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
                 <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',False)"/>
                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c7a420aa845..9631e3151f6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/>
+
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
             <field name="res_model">crm.case.categ</field>
@@ -19,7 +21,8 @@
             <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
             <field name="context">{'object_id':'project.issue'}</field>
         </record>
-        <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
+
+        <menuitem action="project_issue_stage_act" name="Stages" id="menu_project_issue_stage_act" parent="menu_project_confi"/>
 
         <record model="ir.ui.view" id="project_issue_form_view">
             <field name="name">Project Issue Tracker Form</field>
@@ -184,18 +187,18 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group colspan="4" col="20">
-						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-project"/>
-						
+						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+
 						<separator orientation="vertical"/>
-						
-                        <filter icon="gtk-home" string="   Today   "
+
+                        <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
                             help="Today's bugs"
                             />
-                        <filter icon="gtk-media-rewind"
+                        <filter icon="terp-go-week"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
@@ -204,26 +207,26 @@
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
+                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-	                    <filter string="Stage" icon="terp-crm" domain="[]"
+	                    <filter string="Stage" icon="terp-stage" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
-	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                    <filter string="Priority" icon="terp-rating-rated" domain="[]"
 	                        context="{'group_by':'priority'}" />
-	                    <filter string="Campaign" icon="terp-crm"
+	                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
 	                        domain="[]" context="{'group_by':'type_id'}" />
 	                    <separator orientation="vertical" />
-	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                    <filter string="Partner" icon="terp-personal" domain="[]"
 	                        context="{'group_by':'partner_id'}" />
-	                    <filter string="Salesman" icon="terp-crm"
+	                    <filter string="Salesman" icon="terp-personal"
 	                        domain="[]" context="{'group_by':'user_id'}" />
 						<separator orientation="vertical" />
-						<filter string="Month" icon="terp-crm"
+						<filter string="Month" icon="terp-go-month"
 	                        domain="[]" context="{'group_by':'create_date'}" />
 	                    <separator orientation="vertical" />
                 	</group>
@@ -285,12 +288,12 @@
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <group>
-                        <filter icon="gtk-home" string="   Today   "
+                        <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
                             help="Today's features"
                             />
-                        <filter icon="gtk-media-rewind"
+                        <filter icon="terp-go-week"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Features during last 7 days"
@@ -301,8 +304,8 @@
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 5694d33993b..adc1b3c662f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -53,25 +53,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -88,7 +88,7 @@
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
@@ -96,11 +96,11 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <group  expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-personal"
                         	domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
 
@@ -109,42 +109,42 @@
                         	context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
 
-						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+						<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
 	            		<separator orientation="vertical"/>
-	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
+	            		<filter string="Project"  icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" />
+	            		<filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
 	            		<separator orientation="vertical"/>
-	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
+	            		<filter string="Type"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+	            		<filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
 	            		<newline/>
-	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
+	            		<filter string="Assigned To"  icon="terp-personal" domain="[]" context="{'group_by':'assigned_to'}"/>
+	            		<filter string="Partner"  icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+	            		<filter string="Channel"  icon="terp-call-start" domain="[]" context="{'group_by':'canal_id'}"/>
 
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-sale"
                         	domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
                     	<group>
@@ -156,8 +156,8 @@
                     		<field name="task_id"/>
                     		<separator orientation="vertical"/>
                     		<field name="assigned_to" widget="selection">
-                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
- 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
+                    			<filter icon="terp-personal"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
+ 						    	<filter icon="terp-personal-"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
                     		</field>
                     		<newline/>
                     		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 95e9099f549..212af8a30dc 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -93,7 +93,7 @@ class project_phase(osv.osv):
         'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'),
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."),
-        'duration': fields.float('Duration', required=True),
+        'duration': fields.float('Duration', required=True, help="By default in days"),
         'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"),
         'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a2ecc604ebe..e681b0da57f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -47,7 +47,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -102,7 +102,7 @@
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
+                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
@@ -218,23 +218,23 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="responsible_id" widget="selection"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index c89c83b3058..eff475b4f11 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,15 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-	                  <group colspan="4" col="4">
-              		  <label colspan="4" string="This wizard will schedule start date, end date, and assign user to tasks for specified project" />
-              		  <newline />
-		              <field colspan="4" name="project_id"/>
-		              </group>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
+	                <group colspan="4" height="100" width="500">
+                        <field name="project_id"/>
+                        <group colspan="4" col="6">
+                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            	    <button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
 		              </group>
+		            </group>
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 35a7c9f3de6..5a653985a20 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -148,16 +148,16 @@
             <field name="arch" type="xml">
             	<search string="Tasks by User">
             		<group colspan="4" col="3">
-	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
+	            		<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
+	            		<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
 	            		<separator orientation="vertical"/>
 	                    <field name="user_id" select="1" widget="selection"/>
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" default="1" />
-                    	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
-                    	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
+                	    <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" default="1" />
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" />
+                    	<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" />
                 	</group>
             	</search>
             </field>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b886dc60a0e..c2e871f685a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -223,7 +223,7 @@ class purchase_order(osv.osv):
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!' % s['state']))
 
-        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support 
+        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
         wf_service = netsvc.LocalService("workflow")
         for id in unlink_ids:
@@ -248,7 +248,7 @@ class purchase_order(osv.osv):
         return {'value':{'location_id': res, 'dest_address_id': False}}
 
     def onchange_partner_id(self, cr, uid, ids, part):
-        
+
         if not part:
             return {'value':{'partner_address_id': False, 'fiscal_position': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
@@ -264,12 +264,12 @@ class purchase_order(osv.osv):
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         todo = []
-        for po in self.browse(cr, uid, ids):            
+        for po in self.browse(cr, uid, ids):
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
-            for line in po.order_line:            
+            for line in po.order_line:
                 if line.state=='draft':
-                    todo.append(line.id)            
+                    todo.append(line.id)
         current_name = self.name_get(cr, uid, ids)[0][1]
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
@@ -313,13 +313,13 @@ class purchase_order(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for p_id in ids:
             # Deleting the existing instance of workflow for PO
-            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)            
+            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
             wf_service.trg_create(uid, 'purchase.order', p_id, cr)
         return True
 
     def action_invoice_create(self, cr, uid, ids, *args):
         res = False
-       
+
         journal_obj = self.pool.get('account.journal')
         for o in self.browse(cr, uid, ids):
             il = []
@@ -437,7 +437,7 @@ class purchase_order(osv.osv):
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    todo_moves.append(move)    
+                    todo_moves.append(move)
             self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
             self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
             wf_service = netsvc.LocalService("workflow")
@@ -459,26 +459,26 @@ class purchase_order(osv.osv):
 
 
     def do_merge(self, cr, uid, ids, context):
-        """ 
-        To merge similar type of purchase orders.        
-        Orders will only be merged if: 
-        * Purchase Orders are in draft  
-        * Purchase Orders belong to the same partner   
+        """
+        To merge similar type of purchase orders.
+        Orders will only be merged if:
+        * Purchase Orders are in draft
+        * Purchase Orders belong to the same partner
         * Purchase Orders are have same stock location, same pricelist
-        Lines will only be merged if: 
-        * Order lines are exactly the same except for the quantity and unit 
+        Lines will only be merged if:
+        * Order lines are exactly the same except for the quantity and unit
 
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param ids: the ID or list of IDs 
-         @param context: A standard dictionary 
-         
+         @param ids: the ID or list of IDs
+         @param context: A standard dictionary
+
          @return: new purchase order id
-            
-        """          
-        wf_service = netsvc.LocalService("workflow")    
-        def make_key(br, fields):                    
+
+        """
+        wf_service = netsvc.LocalService("workflow")
+        def make_key(br, fields):
             list_key = []
             for field in fields:
                 field_val = getattr(br, field)
@@ -496,9 +496,9 @@ class purchase_order(osv.osv):
             return tuple(list_key)
 
     # compute what the new orders should contain
-  
+
         new_orders = {}
-    
+
         for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
             order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
             new_order = new_orders.setdefault(order_key, ({}, []))
@@ -541,7 +541,7 @@ class purchase_order(osv.osv):
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
 
-        
+
 
         allorders = []
         for order_key, (order_data, old_ids) in new_orders.iteritems():
@@ -601,7 +601,7 @@ class purchase_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
         'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
-        
+
     }
     _defaults = {
         'product_qty': lambda *a: 1.0,
@@ -621,7 +621,7 @@ class purchase_order_line(osv.osv):
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
             name=False, price_unit=False, notes=False):
         if not pricelist:
-            raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.'))
+            raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
         if not  partner_id:
             raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
         if not product:
@@ -692,7 +692,7 @@ class purchase_order_line(osv.osv):
         return res
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context)
-        return True    
+        return True
 purchase_order_line()
 
 class mrp_procurement(osv.osv):
@@ -700,7 +700,7 @@ class mrp_procurement(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
     }
-    
+
     def action_po_assign(self, cr, uid, ids, context={}):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8aa643d1c43..72d4feb0ae9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -150,12 +150,12 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -163,10 +163,13 @@
                     <field name="create_uid" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    <filter string="Source Document”" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
@@ -176,7 +179,7 @@
             <field name="model">purchase.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Purchase Order">
+                <tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
@@ -265,7 +268,7 @@
                 <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
                     <field name="order_id"/>
                     <field name="name"/>
-                    <field name="date_planned" widget="date"/>
+                    <field name="date_planned" widget="date" width="135"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
@@ -276,6 +279,25 @@
             </field>
         </record>
 
+          <record id="purchase_order_line_search" model="ir.ui.view">
+            <field name="name">purchase.order.line.search</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Order">
+                        <group>
+                        <field name='order_id'/>
+                        <field name="product_id" widget="selection" />
+                        </group>
+                        <newline/>
+                        <group expand="0" string="Group By...">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <filter string="Order Reference" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
+                        </group>
+               </search>
+            </field>
+        </record>
+
         <act_window
             context="{'partner_id': active_id}"
             domain="[('partner_id', '=', active_id)]"
@@ -309,6 +331,7 @@
             <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+             <field name="search_view_id" ref="purchase_order_line_search"/>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 0cfc357b51f..5dd8dd31900 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,26 +53,26 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-            	<filter icon="terp-purchase" string="This Year"
+            	<filter icon="terp-go-year" string="This Year"
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in this year"/>
-                <filter icon="terp-purchase" string="This Month"
+                <filter icon="terp-go-month" string="This Month"
                 		name="month"
                 		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 		help="Tasks performed in this month"/>
-                <filter icon="gtk-media-rewind"
+                <filter icon="terp-go-week"
                         string="    7 Days    "
                         separator="1"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks during last 7 days"/>
                 <separator orientation="vertical"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-document-new"
                     	string="Quotations"
                     	domain="[('state','=','draft')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-gtk-media-pause"
                 		string="Waiting Schedule"
                 		domain="[('state','=','waiting_date')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-camera_test"
                 		string="Manual in progress"
                 		domain="[('state','=','manual')]"/>
 
@@ -80,7 +80,7 @@
                 <field name="partner_id" string="Supplier"/>
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-purchase"
+                    <filter icon="terp-personal-"
                     		string="Purchase Non User"
                     		help="Purchase Non User"
                     		domain="[('user_id','=',False)]"/>
@@ -89,30 +89,30 @@
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-dolar" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
-                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Address Contact Name" icon="terp-personal" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Contact Name" icon="terp-gtk-jump-to-ltr" context="{'group_by':'dest_address_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Fiscal Position" icon="terp-go-year" context="{'group_by':'fiscal_position'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
 				<newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
+                    <filter icon="terp-emblem-important" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_approve"/>
                     <separator orientation="vertical"/>
@@ -122,8 +122,8 @@
                     <field name="validator" widget="selection"/>
 
                     <newline/>
-                    <filter icon="terp-purchase" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
-                    <filter icon="terp-purchase" string="Cancel" domain="[('state','=','cancel')]"/>
+                    <filter icon="terp-emblem-important" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
+                    <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
                     <field name="expected_date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 4a4587f5f04..186815c9bc3 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection"/>                    
+					<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
 
                 <notebook colspan="4">
@@ -65,7 +65,7 @@
 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
 						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>                        
+	                </group>
                     </page>
                     <page string="Quotations">
 						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -77,8 +77,8 @@
 			                    <field name="location_id"/>
 			                    <field name="minimum_planned_date"/>
 			                    <field name="origin"/>
-			                    <field name="state"/>	
-			                    </tree>	
+			                    <field name="state"/>
+			                    </tree>
                      	</field>
 						<separator colspan="4" string=""/>
                      	<group col="8" colspan="4">
@@ -117,8 +117,8 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
+                    <filter icon="terp-check" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+					<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
@@ -127,13 +127,13 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-  					<separator orientation="vertical"/>                    
-                    <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="Date End" icon="terp-purchase" domain="[]" context="{'group_by':'date_end'}"/>
-                    <separator orientation="vertical"/>                    
-					<filter string="Origin" icon="terp-purchase" domain="[]" context="{'group_by':'origin'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+  					<separator orientation="vertical"/>
+                    <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                    <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index e7a12e8ac5e..0449b097ec4 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -97,8 +97,8 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group col="10" colspan="4">
-                        <filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
+                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
+                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 861b577ddff..275c111225f 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -17,10 +17,10 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <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'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
@@ -56,8 +56,8 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>
@@ -162,12 +162,12 @@
             <field name="arch" type="xml">
                 <form string="Resource">
                     <field name="name" />
-                    <field name="active"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="calendar_id" widget="selection"/>
-                    <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="resource_type" />
+                    <field name="calendar_id" widget="selection"/>
                     <field name="time_efficiency" groups="base.group_extended"/>
+                    <field name="active"/>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 18c406b2dc0..75dd9d55642 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,23 +51,23 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
             	<group>
-            	    <filter icon="gtk-media-rewind" string="  365 Days  "
+            	    <filter icon="terp-go-year" string="  365 Days  "
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Tasks performed in last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                	name="month"
 	                	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                	help="Tasks performed in last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                     string="    7 Days    "
 	                     separator="1"
 	                     domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                     help="Tasks during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter icon="terp-sale"
+	                <filter icon="terp-document-new"
 	                    string="Quotations"
 	                    domain="[('state','=','draft')]"/>
-	                <filter icon="terp-sale"
+	                <filter icon="terp-dolar"
 	                	string="Sales"
 	                	domain="[('state','not in',('draft','done','cancel'))]"/>
 	                <separator orientation="vertical"/>
@@ -78,29 +78,30 @@
 	                <field name="partner_id"/>
                     <field name="product_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-sale"
+	                    <filter icon="terp-dolar"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
 	                </field>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Default UoM" icon="terp-sale" context="{'group_by':'uom_name'}"/>
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                    <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Category of Product" icon="terp-sale" context="{'group_by':'categ_id'}"/>
+                    <filter string="Pricelist" icon="terp-dolar" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                   <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
 				<newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 356bd69f679..e684a1a6c1d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -510,12 +510,12 @@ class sale_order(osv.osv):
     def action_invoice_end(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-            
+
         for order in self.browse(cr, uid, ids, context=context):
             for line in order.order_line:
                 if line.state == 'exception':
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'state': 'confirmed'}, context=context)
-            
+
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
 
@@ -1085,7 +1085,7 @@ class sale_order_line(osv.osv):
             warning = {
                 'title': 'No Pricelist !',
                 'message':
-                    'You have to select a pricelist in the sale form !\n'
+                    'You have to select a pricelist or a customer in the sale form !\n'
                     'Please set one before choosing a product.'
                 }
         else:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1d49c105f18..4d82e8595ad 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -43,8 +43,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
+
         <menuitem action="action_shop_form" id="menu_action_shop_form"
-            parent="base.menu_base_config" sequence="70"
+            parent="product.prod_config_main" sequence="0"
             groups="base.group_extended"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
@@ -252,21 +253,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
-                    <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Sales To Invoice" domain="[('state','=','manual')]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
@@ -421,21 +422,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id" widget="selection">
-                        <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                        <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personal+" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -447,14 +448,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-purchase" string="Shipped"
+                    <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
                         />
-                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
+                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         />
-                    <filter icon="terp-purchase" string="Sale Order"
+                    <filter icon="terp-dolar" string="Sale Order"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
                         />
@@ -464,10 +465,10 @@
                     <field name="product_id"/>
                     <field name="state"/>
                     <newline />
-                    <group expand="1" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="9" col="8">
+                        <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="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 3a703d1b5ca..bf5f1aaac52 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -35,7 +35,7 @@
         <field name="arch" type="xml">
             <field name="date_order" position="after">
             <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sale Team" groups="base.group_extended">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
                             help="My Sales Team"/>
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index 9d4cdf3e368..aa0a9cf06fe 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -1,8 +1,8 @@
 <openerp>
    <data>
-   
+
    <!-- Sales by journal's view  -->
-   
+
 	    <record model="ir.ui.view" id="view_sale_journal_report_tree">
 	        <field name="name">sale.journal.report.tree</field>
 	        <field name="model">sale.journal.report</field>
@@ -19,9 +19,9 @@
 	            </tree>
 	        </field>
 	    </record>
-	    
+
 	    <!-- sales journal graph view -->
-	    
+
 	    <record id="view_sale_journal_graph" model="ir.ui.view">
 	        <field name="name">sale.journal.report.graph</field>
             <field name="model">sale.journal.report</field>
@@ -33,9 +33,9 @@
               </graph>
            </field>
        </record>
-	    
-	  <!-- sales by journal search view -->  
-	    
+
+	  <!-- sales by journal search view -->
+
 	    <record model="ir.ui.view" id="view_sale_journal_report_search">
 	        <field name="name">sale.journal.report.search</field>
 	        <field name="model">sale.journal.report</field>
@@ -43,16 +43,16 @@
 	        <field name="arch" type="xml">
 	            <search string="Sales by Journal">
 	            	<group col="8" colspan="4">
-		            	<filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
-		               	<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
+		            	<filter icon="terp-go-year" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
 		               	<separator orientation="vertical"/>
-		                <filter icon="terp-sale"
+		                <filter icon="terp-document-new"
 		                    	string="Quotations"
 		                    	domain="[('state','=','draft')]"/>
-		                <filter icon="terp-sale"
+		                <filter icon="terp-gtk-media-pause"
 		                		string="Waiting Schedule"
 		                		domain="[('state','=','waiting_date')]"/>
-		                <filter icon="terp-sale"
+		                <filter icon="terp-camera_test"
 		                		string="In progress"
 		                		domain="[('state','=','progress')]"/>
 		                <separator orientation="vertical"/>
@@ -62,15 +62,15 @@
 					</group>
 					<newline/>
 					<group expand="1" string="Group By..." colspan="4" col="12">
-						<filter string="journal" name="journal" icon="terp-sale" context="{'group_by':'journal_id'}"/>
-						<filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+						<filter string="journal" name="journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
 					</group>
 	            </search>
 	        </field>
 	    </record>
-	
+
 	<!-- Action of sales by journal view-->
-	
+
 	    <record model="ir.actions.act_window" id="action_sale_journal_report_open_menu_all">
 	    	<field name="name">Sales by Journal</field>
 	        <field name="res_model">sale.journal.report</field>
@@ -82,10 +82,10 @@
 	    </record>
 
 	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
-	 
+
 	 <!-- picking by journal and invoice's tree view-->
 
-	
+
 		<record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
 			<field name="name">sale.journal.picking.report.tree</field>
 			<field name="model">sale.journal.picking.report</field>
@@ -105,9 +105,9 @@
 				</tree>
 			</field>
 		</record>
-		
+
 		<!-- picking journal's graph view -->
-		
+
 		<record id="view_sale_journal_picking_graph" model="ir.ui.view">
 	        <field name="name">sale.journal.picking.report.graph</field>
             <field name="model">sale.journal.picking.report</field>
@@ -120,9 +120,9 @@
               </graph>
            </field>
        </record>
-       
+
        <!-- Picking journal search view -->
-		
+
 		<record model="ir.ui.view" id="view_sale_journal_picking_report_search">
 			<field name="name">sale.journal.picking.report.search</field>
 			<field name="model">sale.journal.picking.report</field>
@@ -130,16 +130,16 @@
 			<field name="arch" type="xml">
 				<search string="Picking journal">
 					<group col="8" colspan="4">
-						<filter icon="terp-sale" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
-		               	<filter icon="terp-sale" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
+						<filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
 		               	<separator orientation="vertical"/>
-		                <filter icon="terp-stock"
+		                <filter icon="terp-document-new"
 		                    	string="Draft"
 		                    	domain="[('state','=','draft')]"/>
-		                <filter icon="terp-stock"
+		                <filter icon="terp-gtk-media-pause"
 		                		string="Pending"
 		                		domain="[('state','=','waiting')]"/>
-		                <filter icon="terp-stock"
+		                <filter icon="terp-camera_test"
 		                		string="Confirmed"
 		                		domain="[('state','=','confirmed')]"/>
 		               	<separator orientation="vertical"/>
@@ -147,19 +147,19 @@
 						<field name="month" select="1"/>
 						<field name="invoice_state" select="1"/>
 						<field name="state" select="1"/>
-		            </group>   	
+		            </group>
 		            <newline/>
 		            <group expand="1" string="Group By..." colspan="4" col="12">
-	                    <filter string="Journal" icon="terp-stock" context="{'group_by':'journal_id'}"/>
-	                    <filter string="Invoice" icon="terp-stock" context="{'group_by':'invoice_type_id'}"/>
+	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+	                    <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Invoice state" icon="terp-stock" context="{'group_by':'invoice_state'}"/>
-	                    <filter string="state" icon="terp-stock" context="{'group_by':'state'}"/>
+	                    <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
+	                    <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
 					</group>
 				</search>
 			</field>
 		</record>
-		
+
 		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
 			<field name="name">Statistics on picking to invoice</field>
 			<field name="res_model">sale.journal.picking.report</field>
@@ -168,9 +168,9 @@
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
 		</record>
-	
+
 	<!-- Action for picking journal view -->
-	
+
 		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
 			<field name="name">Picking Journal</field>
 			<field name="res_model">sale.journal.picking.report</field>
@@ -180,8 +180,8 @@
 			<field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
 			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
 		</record>
-		
+
 		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>
-	    
+
 	</data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 60161a1b2bf..7e4cc33b283 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,8 +1,8 @@
 <openerp>
    <data>
-   
+
    <!--  sale journal invoice Type's Form  view -->
-   
+
 	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
 	        <field name="name">sale_journal.invoice.type.form</field>
 	        <field name="model">sale_journal.invoice.type</field>
@@ -17,9 +17,9 @@
 	            </form>
 	        </field>
 	    </record>
-	    
-	  <!--  sale journal invoice Type's tree  view -->    
-	    
+
+	  <!--  sale journal invoice Type's tree  view -->
+
 	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
 	        <field name="name">sale_journal.invoice.type.tree</field>
 	        <field name="model">sale_journal.invoice.type</field>
@@ -31,19 +31,19 @@
 	            </tree>
 	        </field>
 	    </record>
-	    
-	  <!-- Action for sale journal invoice Type -->  
-	     
+
+	  <!-- Action for sale journal invoice Type -->
+
 	    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
 	        <field name="res_model">sale_journal.invoice.type</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,form</field>
 	    </record>
-	
+
 	<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
-	
+
 	<!-- sale journal Form view  -->
-	
+
 	    <record model="ir.ui.view" id="view_sale_journal_form">
 	        <field name="name">sale_journal.sale.journal.form</field>
 	        <field name="model">sale_journal.sale.journal</field>
@@ -57,7 +57,7 @@
 	                    <field name="date" select="1"/>
 	                    <field name="date_created" select="1"/>
 	                    <field name="date_validation" select="1"/>
-	                </group>    
+	                </group>
 					<notebook colspan="4">
 		                <page string="Sales">
 		                    <field name="sale_stats_ids" colspan="4" nolabel="1">
@@ -86,9 +86,9 @@
 	            </form>
 	        </field>
 	    </record>
-	    
-  <!-- Sale journal tree view -->	    
-	    
+
+  <!-- Sale journal tree view -->
+
 	    <record model="ir.ui.view" id="view_sale_journal_tree">
 	        <field name="name">sale_journal.sale.journal.tree</field>
 	        <field name="model">sale_journal.sale.journal</field>
@@ -103,9 +103,9 @@
 	            </tree>
 	        </field>
 	    </record>
-	
-	<!-- Sale journal search view -->	  
-	
+
+	<!-- Sale journal search view -->
+
 	    <record model="ir.ui.view" id="view_sale_journal_search">
 	        <field name="name">sale_journal.sale.journal.search</field>
 	        <field name="model">sale_journal.sale.journal</field>
@@ -113,8 +113,8 @@
 	        <field name="arch" type="xml">
 	            <search string="Sales by Journal">
 	            	<group col="8" colspan="4">
-		            	<filter icon="terp-sale" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
-		               	<filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
+		            	<filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
+		               	<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
 		               	<separator orientation="vertical"/>
 		                <field name="name" select="1"/>
 		                <field name="code" select="1"/>
@@ -124,20 +124,20 @@
 	            </search>
 	        </field>
 	    </record>
-	    
-      <!-- Action for sale journal view -->	
-	
+
+      <!-- Action for sale journal view -->
+
 	    <record model="ir.actions.act_window" id="action_definition_journal">
 	        <field name="res_model">sale_journal.sale.journal</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,form</field>
 	        <field name="search_view_id" ref="view_sale_journal_search"/>
 	    </record>
-	
+
 		<menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
-	
-	<!-- Inherit sales order form view -->  
-	
+
+	<!-- Inherit sales order form view -->
+
 	    <record model="ir.ui.view" id="sale_journal_sale_order">
 	        <field name="name">sale.order.journal.view.form</field>
 	        <field name="type">form</field>
@@ -151,9 +151,9 @@
 	            </field>
 	        </field>
 	    </record>
-	    
+
 	    <!-- Inherit sales order tree view-->
-	    
+
 	    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
 	        <field name="name">sale.order.journal.view.tree</field>
 	        <field name="type">tree</field>
@@ -167,8 +167,8 @@
 	        </field>
 	    </record>
 
-<!--  Inherit stock picking's form view  -->	
-	
+<!--  Inherit stock picking's form view  -->
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order">
 	        <field name="name">stock.picking.journal.view.form</field>
 	        <field name="type">form</field>
@@ -183,8 +183,8 @@
 	        </field>
 	    </record>
 
-<!--  Inherit stock picking's tree view  -->	
-	
+<!--  Inherit stock picking's tree view  -->
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
 	        <field name="name">stock.picking.journal.view.tree</field>
 	        <field name="type">tree</field>
@@ -198,9 +198,9 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	<!--  Inherit stock picking delivery's form  view.-->
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_del">
 	        <field name="name">stock.picking.journal.view.form</field>
 	        <field name="type">form</field>
@@ -214,9 +214,9 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	<!--  Inherit stock picking delivery's tree  view.-->
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
 	        <field name="name">stock.picking.journal.view.tree</field>
 	        <field name="type">tree</field>
@@ -230,7 +230,7 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_in">
 	        <field name="name">stock.picking.journal.view.form</field>
 	        <field name="type">form</field>
@@ -244,7 +244,7 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
 	        <field name="name">stock.picking.journal.view.tree</field>
 	        <field name="type">tree</field>
@@ -258,7 +258,7 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_out">
 	        <field name="name">stock.picking.journal.view.form</field>
 	        <field name="type">form</field>
@@ -272,7 +272,7 @@
 	            </field>
 	        </field>
 	    </record>
-	
+
 	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
 	        <field name="name">stock.picking.journal.view.tree</field>
 	        <field name="type">tree</field>
@@ -286,33 +286,33 @@
 	            </field>
 	        </field>
 	    </record>
-	    
-	    <!-- Action of sale journal report in sale journal  --> 
-	
+
+	    <!-- Action of sale journal report in sale journal  -->
+
 	    <act_window name="Monthly sales"
 	        domain="[('journal_id', '=', active_id)]"
 	        res_model="sale.journal.report"
 	        src_model="sale_journal.sale.journal"
 	        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
-	
-	   <!-- Action  of stock picking  in picking journal  --> 
-	
+
+	   <!-- Action  of stock picking  in picking journal  -->
+
 	    <act_window name="Assigned picking"
 	        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
 	        res_model="stock.picking"
 	        src_model="sale_journal.picking.journal"
 	        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
-	        
-	  <!-- Action  of stock picking  in picking journal  -->        
-	
+
+	  <!-- Action  of stock picking  in picking journal  -->
+
 	    <act_window name="Confirmed picking"
 	        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
 	        res_model="stock.picking"
 	        src_model="sale_journal.picking.journal"
 	        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
-	        
-	 <!-- Action  of stock picking  in sale journal  -->       
-	        
+
+	 <!-- Action  of stock picking  in sale journal  -->
+
 	    <act_window name="Assigned picking"
         	domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
         	res_model="stock.picking"
@@ -328,21 +328,21 @@
 	        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
 
 	<!-- Action of sale order in sale journal -->
-	
+
 	    <act_window name="Draft sales"
 	        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
 	        res_model="sale.order"
 	        src_model="sale_journal.sale.journal"
 	        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
-	        
-	  <!-- Action  of sale order in sale journal -->      
-	
+
+	  <!-- Action  of sale order in sale journal -->
+
 	    <act_window name="Approved sales"
 	        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
 	        res_model="sale.order"
 	        src_model="sale_journal.sale.journal"
 	        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
-	
+
 	    <record id="view_partner_property_form" model="ir.ui.view">
 	        <field name="name">res.partner.journal.property.form.inherit</field>
 	        <field name="model">res.partner</field>
@@ -354,11 +354,11 @@
 	            </page>
 	        </field>
 	    </record>
-	    
+
 	<!--=====================================================-->
 	<!-- picking journal view-->
 	<!--=====================================================    -->
-	
+
 	    <record model="ir.ui.view" id="view_picking_journal_form">
 	        <field name="name">sale_journal.picking.journal.form</field>
 	        <field name="model">sale_journal.picking.journal</field>
@@ -373,7 +373,7 @@
 	                    <field name="date" select="1"/>
 	                    <field name="date_created" select="1"/>
 	                    <field name="date_validation" select="1"/>
-	                </group>    
+	                </group>
 					<notebook colspan="4">
 		                <page string="Picking">
 		                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
@@ -392,7 +392,7 @@
 	            </form>
 	        </field>
 	    </record>
-	    
+
 	    <record model="ir.ui.view" id="view_picking_journal_tree">
 	        <field name="name">sale_journal.picking.journal.tree</field>
 	        <field name="model">sale_journal.picking.journal</field>
@@ -408,8 +408,8 @@
 	        </field>
 	    </record>
 
-       <!-- Picking journal tree view  -->	
-	
+       <!-- Picking journal tree view  -->
+
 	    <record model="ir.ui.view" id="view_picking_journal_search">
 	        <field name="name">sale_journal.picking.journal.search</field>
 	        <field name="model">sale_journal.picking.journal</field>
@@ -417,8 +417,8 @@
 	        <field name="arch" type="xml">
 	            <search string="Picking Journals">
 	                <group col="8" colspan="4">
-	                    <filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
-	                    <filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+	                    <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
+	                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="name" select="1"/>
 	                    <field name="code" select="1"/>
@@ -428,9 +428,9 @@
 	            </search>
 	        </field>
 	    </record>
-	    
-<!-- Action of Picking journals -->	    
-	    
+
+<!-- Action of Picking journals -->
+
 	    <record model="ir.actions.act_window" id="action_definition_picking_journal">
 	        <field name="name">Picking Journals</field>
 	        <field name="res_model">sale_journal.picking.journal</field>
@@ -438,16 +438,16 @@
 	        <field name="view_mode">tree,form</field>
 	        <field name="search_view_id" ref="view_picking_journal_search"/>
 	    </record>
-	
+
 	    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
-	
+
 	    <record model="ir.actions.act_window" id="action_invoice_type_tree">
 	        <field name="name">Picking by invoice_method</field>
 	        <field name="res_model">sale_journal.invoice.type</field>
 	        <field name="type">ir.actions.act_window</field>
 	        <field name="view_type">tree</field>
 	    </record>
-	
+
 	    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
 	        <field name="name">Picking to invoice</field>
 	        <field name="res_model">stock.picking</field>
@@ -456,7 +456,7 @@
 	        <field name="view_mode">tree,form</field>
 	        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
 	    </record>
-	    
+
 	    <record model="ir.values" id="ir_open_invoice_type">
 	        <field name="key2">tree_but_open</field>
 	        <field name="model">sale_journal.invoice.type</field>
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 80e93b9d886..2e3a0ca3fcb 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -29,7 +29,7 @@ class scrum_project(osv.osv):
     _inherit = 'project.project'
     _columns = {
         'product_owner_id': fields.many2one('res.users', 'Product Owner'),
-        'sprint_size': fields.integer('Sprint Days'),
+        'sprint_size': fields.integer('Sprint Days',help="Number of days allocated for sprint"),
         'scrum': fields.integer('Is a Scrum Project'),
     }
     _defaults = {
@@ -105,7 +105,7 @@ class scrum_sprint(osv.osv):
         'date_start': fields.date('Starting Date', required=True),
         'date_stop': fields.date('Ending Date', required=True),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
-        'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True),
+        'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True,help="The person who is responsible for the product"),
         'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True),
         'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
         'review': fields.text('Sprint Review'),
@@ -251,7 +251,7 @@ class scrum_task(osv.osv):
                 result[task.id] = True
         return result.keys()
     _columns = {
-        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog'),
+        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
         'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='scrum.sprint', string='Sprint',
             store={
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['product_backlog_id'], 10),
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index dc015c3f38a..be16ecfa7e5 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -33,7 +33,7 @@
             <field name="model">scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Product Backlog">
+                <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="project_id"/>
@@ -127,14 +127,14 @@
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
                         <filter default="1"
-                            icon="terp-project"
+                            icon="terp-check"
                             string="Current"
                             name="current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
                             help="Current Backlogs"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
-                        <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
@@ -151,11 +151,11 @@
                         <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                        <filter string="Responsible" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
 
                 </search>
@@ -184,7 +184,7 @@
             <field name="model">scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Scrum Sprint">
+            	<tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -260,9 +260,10 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter name="filter_current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
-                        <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
-                        <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
+                        <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
@@ -270,13 +271,13 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Masters" icon="terp-project" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
-                        <filter string="Product owner" icon="terp-project" domain="[]" context="{'group_by':'product_owner_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
+                        <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -349,18 +350,18 @@
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
                     <group col="10" colspan="4">
-                        <filter name="scrum_daily" icon="terp-project" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
+                        <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id" widget="selection">
-                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
+                            <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
                         <field name="project_id" widget="selection"/>
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                        <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -493,7 +494,7 @@
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
-                        <filter icon="terp-project" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                     </field>
                 </field>
             </field>
@@ -506,8 +507,8 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='End Date']" position="after">
-                    <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                    <filter string="Backlog" icon="terp-project" domain="[]" context="{'group_by':'product_backlog_id'}"/>
+                    <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                    <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
                     <separator orientation="vertical"/>
                 </xpath>
             </field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 94d20f7a95e..6c3d09f2895 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -350,7 +350,7 @@ stock_location()
 class stock_tracking(osv.osv):
     _name = "stock.tracking"
     _description = "Stock Tracking Lots"
-    
+
     def get_create_tracking_lot(self, cr, uid, ids, tracking_lot):
         tracking_lot_list = self.search(cr, uid, [('name', '=', tracking_lot)],
                                             limit=1)
@@ -893,7 +893,7 @@ class stock_picking(osv.osv):
         move_obj = self.pool.get('stock.move')
         if not context:
             context = {}
-            
+
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
                 raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
@@ -906,7 +906,7 @@ class stock_picking(osv.osv):
                     move_obj.action_cancel(cr, uid, ids2, ctx)
                 #Removing the move
                 move_obj.unlink(cr, uid, ids2, ctx)
-                    
+
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
     def do_partial(self, cr, uid, ids, partial_datas, context={}):
@@ -1219,7 +1219,7 @@ class stock_move(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
         'product_qty': fields.float('Quantity', required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'product_uos_qty': fields.float('Quantity (UOS)'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
@@ -1294,7 +1294,7 @@ class stock_move(osv.osv):
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
-        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),        
+        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 
     def copy(self, cr, uid, id, default=None, context={}):
@@ -1648,14 +1648,14 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        tracking_lot = False                    
+        tracking_lot = False
         if context:
             tracking_lot = context.get('tracking_lot', False)
             if tracking_lot:
                 rec_id = context and context.get('active_id', False)
                 tracking = self.pool.get('stock.tracking')
-                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
-                 
+                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
+
         self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_lot or False})
         picking_obj = self.pool.get('stock.picking')
         for pick in picking_obj.browse(cr, uid, picking_ids):
@@ -1669,7 +1669,7 @@ class stock_move(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
-            context = {}        
+            context = {}
         for move in self.browse(cr, uid, ids, context=context):
             if move.state != 'draft':
                 raise osv.except_osv(_('UserError'),
@@ -1877,7 +1877,7 @@ class stock_move(osv.osv):
         address_id = partial_datas.get('address_id', False)
         delivery_date = partial_datas.get('delivery_date', False)
         tracking_lot = context.get('tracking_lot', False)
-        
+
         new_moves = []
 
         complete, too_many, too_few = [], [], []
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8eca73792a1..92653501ed3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -341,7 +341,7 @@
                     <field name="location_dest_id" />
                     <field name="date" />
                     <field name="date_planned" string="Date"/>
-                     <field name="date_expected" string="Date Expected"/>                    
+                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -653,7 +653,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected" string="Date Expected"/>                                            
+                                             <field name="date_expected" string="Date Expected"/>
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
@@ -778,7 +778,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                     <field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -805,7 +805,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -958,7 +958,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                     <field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -985,7 +985,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -1160,7 +1160,7 @@
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
-                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
+                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>
                                             <newline/>
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
@@ -1222,6 +1222,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
+                        <field name="origin"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
@@ -1232,8 +1233,6 @@
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
             </field>
@@ -1361,7 +1360,7 @@
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
-                                <field name="date_expected"/>                                
+                                <field name="date_expected"/>
                                 <field name="priority"/>
                             </group>
 
@@ -1475,12 +1474,12 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="location_id"/>
-                            <field name="location_dest_id"/>
+                            <field name="location_id" widget="selection"/>
+                            <field name="location_dest_id" widget="selection"/>
                             <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                            <field name="product_uom"/>
-                            <field name="product_uos"/>
+                            <field name="product_uom" widget="selection"/>
+                            <field name="product_uos" widget="selection" groups="base.group_extended"/>
                             <field colspan="4" name="name"/>
                             <field name="date"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -1497,8 +1496,10 @@
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field name="tracking_id"/>
                             <newline/>
-                            <label/>
-                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <group col="2" colspan="2">
+                                <label/>
+                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            </group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
@@ -1541,7 +1542,9 @@
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'date_expected'}" />
                     </group>
                 </search>
             </field>