diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a3db4b08f93..263b34322b9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,13 +161,13 @@ class hr_evaluation(osv.osv):
             ('2','Meet expectations'),
             ('3','Exceeds expectations'),
             ('4','Significantly exceeds expectations'),
-        ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
+        ], "Appreciation", help="This is the appreciation on that summarize the evaluation"),
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('wait','Plan In Progress'),
-            ('progress','Waiting Validation'),
+            ('progress','Waiting Appreciation'),
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cafffe2646e..9ec02b4ad0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,14 +231,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('wait', 'progress'))]"/>                                       
-                    <separator orientation="vertical"/> 
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-dialog-close" string="Waiting Final Validation" domain="[('state','=','progress')]"/>                                        
-                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
+                    <separator orientation="vertical"/> 
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -321,7 +319,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -332,7 +330,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>