diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 35e3f794571..5ccdb90ed71 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -128,6 +128,11 @@
                    <field name="event_date" select="1"/>
                    <newline/>
                     <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]"
+                            context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-partner" domain="[]"
+                            context="{'group_by':'partner_address_id'}" />
+                        <separator orientation="vertical" />
                         <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
                             domain="[]" context="{'group_by':'cutype'}" />
                         <filter string="Role" icon="terp-gtk-select-all"
@@ -135,10 +140,6 @@
                         <filter string="Required Reply" icon="terp-mail-replied"
                             domain="[]" context="{'group_by':'rsvp'}" />
                         <separator orientation="vertical" />
-                        <filter string="User" icon="terp-personal" domain="[]"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
-                            context="{'group_by':'partner_address_id'}" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':'state'}" />
                     </group>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5dbadcd26e1..3f36ad6ce2a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -319,32 +319,31 @@
                            </field>
                            <field name="user_id" select="1"/>
                        </group>
-                       <newline/>
-                           <group expand="0" string="Group By...">
-                            <filter string="Date" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date'}" />
-                            <filter string="Privacy" icon="terp-locked"
-                                domain="[]" context="{'group_by':'class'}" />
-                            <filter string="Show time as" icon="terp-project"
-                                domain="[]" context="{'group_by':'show_as'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Responsible" icon="terp-personal" domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <filter string="Partner" icon="terp-personal" domain="[]"
-                                context="{'group_by':'partner_id'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Meeting Type" help="Meeting Type"
-                            	icon="terp-stock_symbol-selection" domain="[]"
-                            	context="{'group_by':'categ_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <separator orientation="vertical" />
-                        </group>
                         <newline/>
                         <group expand="0" string="Extended Options...">
                            <field name="class" select="1" string="Privacy"/>
                            <field name="show_as" string="Show time as" select="1"/>
                         </group>
+                       <newline/>
+                       <group expand="0" string="Group By...">
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <filter string="Partner" icon="terp-partner" domain="[]"
+                                context="{'group_by':'partner_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Type" help="Meeting Type"
+                            	icon="terp-stock_symbol-selection" domain="[]"
+                            	context="{'group_by':'categ_id'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <filter string="Show time as" icon="terp-project"
+                                domain="[]" context="{'group_by':'show_as'}" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Date" icon="terp-go-month" help="Meeting date"
+                                domain="[]" context="{'group_by':'date'}" />
+                        </group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 632cb2510c8..740b113d0ed 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -284,7 +284,7 @@
                 <field name="arch" type="xml">
                     <search string="Search Opportunities">
                         <filter icon="terp-check"
-                            string="Current"  help="Current Opportunities"
+                            string="Current"  help="Draft and Open Opportunities"
                             name="current"
                             domain="[('state','in',('draft','open'))]"/>
                         <filter icon="terp-camera_test"
@@ -338,19 +338,19 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">
+                            <filter string="Salesman" icon="terp-personal"
+                                domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                            <filter string="Assigned Partner" icon="terp-partner"
+                                domain="[]" context="{'group_by':'partner_assigned_id'}" />
+                            <separator orientation="vertical" />
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <filter string="Priority" icon="terp-rating-rated" domain="[]"
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Salesman" icon="terp-personal"
-                                domain="[]" context="{'group_by':'user_id'}" />
-                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                            <filter string="Assigned Partner" icon="terp-personal"
-                                domain="[]" context="{'group_by':'partner_assigned_id'}" />
+                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <separator orientation="vertical" />
                             <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ae243b8cfb0..be1f62a46db 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -260,10 +260,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Current"
+               <filter icon="terp-check" string="Current"
                    name="current"
                    domain="[('state','in', ('draft','open','pending'))]"/>
-               <separator orientation="vertical"/>
                <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
@@ -292,15 +291,15 @@
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-personal" domain="[]"
+                   <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-personal"
                        domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month"
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
                        domain="[]" context="{'group_by':'create_date'}" />
                    <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" />
+                       context="{'group_by':'date'}" help="Date of Call" />
                </group>
            </search>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9d08b231eeb..7aa7f8bc0ca 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -269,7 +269,7 @@
                 <search string="Search Claims">
                    <filter icon="terp-check" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Current Claims" default="1"
+                       separator="1" help="Draft and Open Claims" default="1"
                    />
                    <filter icon="terp-camera_test"
                        string="In Progress"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index dd7c2094f74..8cb6b5ba6a1 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -298,7 +298,7 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
-                            <filter string="Partner" icon="terp-personal"
+                            <filter string="Partner" icon="terp-partner"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
                             <filter string="Responsible" icon="terp-personal"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0f657afb895..f7c89620f29 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -264,10 +264,10 @@
                            domain="[]" help="Sales Team"
                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}" />
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
                            domain="[]" help="Request Date"