diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index f84a026748b..04189ab4711 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -57,7 +57,7 @@
         'hr_holidays_wizard.xml',
         #'process/hr_holidays_process.xml'
     ],
-    'demo_xml': [],
+    'demo_xml': ['hr_holidays_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0086579209325',
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
new file mode 100644
index 00000000000..5e9f8cfae07
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+
+		<!-- Casual leave -->
+		<record model="hr.holidays.status" id="holiday_status_cl">
+			<field name="name">Casual Leave</field>
+			<field name="color_name">red</field>
+		</record>
+
+		<record model="hr.holidays.per.user" id="holiday_user_employee1_cl">
+			<field name="employee_id" ref="hr.employee1"/>
+			<field name="holiday_status" ref="holiday_status_cl"/>
+			<field name="max_leaves">12</field>
+		</record>
+
+		<record model="hr.holidays" id="hr_holidays_employee1_cl">
+			<field name="name">Going For Tour</field>
+			<field name="holiday_status_id" ref="holiday_status_cl"/>
+			<field name="date_from">2010-01-01 08:00</field>
+			<field name="date_to">2010-01-03 18:00</field>
+			<field name="number_of_days_temp">3</field>
+			<field name="employee_id" ref="hr.employee1"/>
+		</record>
+
+		<!-- Sick leave -->
+		<record model="hr.holidays.status" id="holiday_status_sl">
+			<field name="name">Sickness Leave</field>
+			<field name="color_name">black</field>
+		</record>
+
+		<record model="hr.holidays.per.user" id="holiday_user_employee1_sl">
+			<field name="employee_id" ref="hr.employee1"/>
+			<field name="holiday_status" ref="holiday_status_sl"/>
+			<field name="max_leaves">6</field>
+		</record>
+
+		<record model="hr.holidays" id="hr_holidays_employee1_sl">
+			<field name="name">Sickness</field>
+			<field name="holiday_status_id" ref="holiday_status_sl"/>
+			<field name="date_from">2010-02-01 00:00</field>
+			<field name="date_to">2010-02-03 08:00</field>
+			<field name="number_of_days_temp">3</field>
+			<field name="employee_id" ref="hr.employee1"/>
+		</record>
+
+	</data>
+</openerp>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 146e06d25a3..ecaf1ec9026 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -15,22 +15,26 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                        <group col='8' colspan='4'>
-                           <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
-                           <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
-                           <separator orientation="vertical"/> 
+                           <filter icon="gtk-yes" domain="[('state','=','draft')]" string="To Confirm"/>
+                           <filter icon="gtk-apply" domain="[('state','=','confirm')]" string="To Validate"/>
+                           <separator orientation="vertical"/>
                           <field name="name" select='1'/>
                           <field name="state" select="1">
                               <filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
                               <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
-                          </field>                          
+                          </field>
                           <field name="user_id" select="1" widget="selection">
-                              <filter icon="gtk-execute" help="My Leaves" domain="[('user_id','=',uid)]" />  
-                          </field> 
+                              <filter icon="terp-partner" help="My Leaves" domain="[('user_id','=',uid)]" />
+                          </field>
                           <field name="department_id" select="1" widget="selection">
-                          		<filter icon="gtk-execute" domain="[('department_id','=',context.get('department_id',False))]"
+                          		<filter icon="gtk-home" domain="[('department_id','=',context.get('department_id',False))]"
 								help="My Departments Leaves"/>
                           </field>
                       </group>
+                      <newline/>
+	                  <group col='8' colspan='15' expand='1' string='Group by...'>
+	                      <filter string='State' icon="terp-report" domain="[]" context="{'group_by' : 'state'}" />
+	                  </group>
                  </search>
             </field>
         </record>
@@ -211,28 +215,28 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-     <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_holiday"/>
-        <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>
+	    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_holiday"/>
+	        <field name="act_window_id" ref="open_ask_holidays"/>
+	    </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="edit_holiday_new"/>
-        <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>
+	    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="edit_holiday_new"/>
+	        <field name="act_window_id" ref="open_ask_holidays"/>
+	    </record>
 
 
-   <!--  <menuitem
-          name="Holidays Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_open_ask_holidays_new"
-            action="open_ask_holidays"/>-->
-       <menuitem
-          name="Leaves Requests"
+	   <!--  <menuitem
+	          name="Holidays Requests"
+	            parent="menu_open_ask_holidays"
+	            id="menu_open_ask_holidays_new"
+	            action="open_ask_holidays"/>-->
+       	<menuitem
+            name="Leaves Requests"
             parent="menu_open_ask_holidays"
             id="menu_open_ask_holidays_new"
             action="open_ask_holidays"/>
@@ -246,26 +250,26 @@
             <field name="view_id" ref="allocation_leave_new" />
         </record>
 
-	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_holiday"/>
-        <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>
+		<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_holiday"/>
+	        <field name="act_window_id" ref="open_allocation_holidays"/>
+	    </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="allocation_company_new"/>
-        <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>
+	    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="allocation_company_new"/>
+	        <field name="act_window_id" ref="open_allocation_holidays"/>
+	    </record>
 
 
-    <!-- <menuitem
-          name="Allocation Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_open_allocation_holidays"
-            action="open_allocation_holidays"/>-->
+	    <!-- <menuitem
+	          name="Allocation Requests"
+	            parent="menu_open_ask_holidays"
+	            id="menu_open_allocation_holidays"
+	            action="open_allocation_holidays"/>-->
 
         <!-- holidays status -->
         <record model="ir.ui.view" id="edit_holiday_status_form">