diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index 1c083ba8b10..1208b7f4ab6 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -368,7 +368,7 @@
         <field name="name">hr.leave.view.calendar</field>
         <field name="model">hr.leave</field>
         <field name="arch" type="xml">
-            <calendar string="Time Off Request" event_open_popup="true" readonly_form_view_id="%(hr_holidays.hr_leave_view_form_manager)d" form_view_id="%(hr_holidays.hr_leave_view_form_manager)d" date_start="date_from" date_stop="date_to" mode="month" quick_add="False" color="employee_id">
+            <calendar string="Time Off Request" event_open_popup="true" date_start="date_from" date_stop="date_to" mode="month" quick_add="False" color="employee_id">
                 <field name="display_name"/>
             </calendar>
         </field>
@@ -440,11 +440,16 @@
         <field name="name">All Time Off</field>
         <field name="res_model">hr.leave</field>
         <field name="view_type">form</field>
-        <field name="view_mode">calendar</field>
-        <field name="context">{'search_default_year': 1, 'search_default_group_employee': 1, 'search_default_managed_people': 1, 'search_default_managed_people': 1, 'search_default_my_team_leaves': 1}</field>
+        <field name="view_mode">calendar,tree</field>
+        <field name="context">{
+            'search_default_year': 1,
+            'search_default_group_employee': 1,
+            'search_default_managed_people': 1,
+            'search_default_my_team_leaves': 1,
+            'form_view_ref': 'hr_holidays.hr_leave_view_form_manager',
+        }</field>
         <field name="domain">[('holiday_type','=','employee'), ('state', '!=', 'refuse')]</field>
         <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        <field name="view_id" ref="hr_leave_view_calendar"/>
     </record>
 
     <menuitem
@@ -594,7 +599,7 @@
         <field name="res_model">hr.leave</field>
         <field name="binding_model_id" ref="hr.model_hr_employee"/>
         <field name="view_mode">tree,kanban,form,calendar,activity</field>
-        <field name="context">{}</field>
+        <field name="context">{'form_view_ref': 'hr_holidays.hr_leave_view_form_manager'}</field>
         <field name="domain">[]</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -602,18 +607,6 @@
             </p>
         </field>
     </record>
-    <record id="hr_leave_action_all_tree_form" model="ir.actions.act_window.view">
-        <field name="sequence">2</field>
-        <field name="view_mode">tree</field>
-        <field name="act_window_id" ref="hr_leave_action_all"/>
-        <field name="view_id" ref="hr_leave_view_tree"/>
-    </record>
-    <record id="hr_leave_action_all_view_form" model="ir.actions.act_window.view">
-        <field name="sequence">10</field>
-        <field name="view_mode">form</field>
-        <field name="act_window_id" ref="hr_leave_action_all"/>
-        <field name="view_id" ref="hr_leave_view_form_manager"/>
-    </record>
 
     <record id="hr_leave_action_action_approve_department" model="ir.actions.act_window">
         <field name="name">Department Time Off</field>