diff --git a/chrono/manager/templates/chrono/manager_agenda_date_view.html b/chrono/manager/templates/chrono/manager_agenda_date_view.html
new file mode 100644
index 00000000..0a8046c2
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_agenda_date_view.html
@@ -0,0 +1,17 @@
+{% extends "chrono/manager_agenda_view.html" %}
+{% load i18n %}
+
+{% block appbar %}
+  {% block navigation %}{% endblock %}
+
+  <span class="actions">
+    {% block actions %}
+      {% if user_can_manage %}
+        <a href="{{ agenda.get_settings_url }}">{% trans 'Settings' %}</a>
+      {% endif %}
+      <a href="" onclick="window.print()">{% trans 'Print' %}</a>
+
+      {% include "chrono/manager_agenda_view_buttons_fragment.html" with active=kind %}
+    {% endblock %}
+  </span>
+{% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_day_view.html b/chrono/manager/templates/chrono/manager_agenda_day_view.html
index c8ca659f..a1aaf921 100644
--- a/chrono/manager/templates/chrono/manager_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_day_view.html
@@ -1,4 +1,4 @@
-{% extends "chrono/manager_agenda_view.html" %}
+{% extends "chrono/manager_agenda_date_view.html" %}
 {% load i18n %}
 
 {% block bodyargs %}class="dayview"{% endblock %}
@@ -8,7 +8,7 @@
   <a>{{ day|date:"SHORT_DATE_FORMAT" }}</a>
 {% endblock %}
 
-{% block appbar %}
+{% block navigation %}
   <span class="buttons-group">
     <a class="date-prev pk-button" href="{{ view.get_previous_day_url }}"><span class="sr-only">{% trans "Previous day" %}</span></a>
     <a class="date-next pk-button" href="{{ view.get_next_day_url }}"><span class="sr-only">{% trans "Next day" %}</span></a>
@@ -23,12 +23,4 @@
       </div>
     {% endwith %}
   </h2>
-  <span class="actions">
-    {% block actions %}
-      {% if user_can_manage %}
-        <a href="{% url 'chrono-manager-agenda-settings' pk=agenda.id %}">{% trans 'Settings' %}</a>
-      {% endif %}
-      <a href="" onclick="window.print()">{% trans 'Print' %}</a>
-    {% endblock %}
-  </span>
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_month_view.html b/chrono/manager/templates/chrono/manager_agenda_month_view.html
index c3186bdc..e5f67897 100644
--- a/chrono/manager/templates/chrono/manager_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_month_view.html
@@ -1,4 +1,4 @@
-{% extends "chrono/manager_agenda_view.html" %}
+{% extends "chrono/manager_agenda_date_view.html" %}
 {% load i18n %}
 
 {% block bodyargs %}class="monthview"{% endblock %}
@@ -8,7 +8,7 @@
   <a>{{ view.date|date:"F Y" }}</a>
 {% endblock %}
 
-{% block appbar %}
+{% block navigation %}
   <span class="buttons-group">
     <a class="date-prev pk-button" href="{{ view.get_previous_month_url }}"><span class="sr-only">{% trans "Previous month" %}</span></a>
     <a class="date-next pk-button" href="{{ view.get_next_month_url }}"><span class="sr-only">{% trans "Next month" %}</span></a>
@@ -24,12 +24,4 @@
       </div>
     {% endwith %}
   </h2>
-  <span class="actions">
-    {% block actions %}
-      {% if user_can_manage %}
-        <a href="{{ agenda.get_settings_url }}">{% trans 'Settings' %}</a>
-      {% endif %}
-      <a href="" onclick="window.print()">{% trans 'Print' %}</a>
-    {% endblock %}
-  </span>
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_week_view.html b/chrono/manager/templates/chrono/manager_agenda_week_view.html
index 937f6633..9316f136 100644
--- a/chrono/manager/templates/chrono/manager_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_week_view.html
@@ -1,4 +1,4 @@
-{% extends "chrono/manager_agenda_view.html" %}
+{% extends "chrono/manager_agenda_date_view.html" %}
 {% load i18n %}
 
 {% block bodyargs %}class="weekview"{% endblock %}
@@ -35,7 +35,7 @@
   <a>{{ view.first_day|date:"F Y" }}</a>
 {% endblock %}
 
-{% block appbar %}
+{% block navigation %}
   <span class="buttons-group">
     <a class="date-prev pk-button" href="{{ view.get_previous_week_url }}"><span class="sr-only">{% trans "Previous week" %}</span></a>
     <a class="date-next pk-button" href="{{ view.get_next_week_url }}"><span class="sr-only">{% trans "Next week" %}</span></a>
@@ -51,12 +51,4 @@
       </div>
     {% endwith %}
   </h2>
-  <span class="actions">
-    {% block actions %}
-      {% if user_can_manage %}
-        <a href="{{ agenda.get_settings_url }}">{% trans 'Settings' %}</a>
-      {% endif %}
-      <a href="" onclick="window.print()">{% trans 'Print' %}</a>
-    {% endblock %}
-  </span>
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
index 8e03c3e4..afb9c42d 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
@@ -10,7 +10,6 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
index b829073b..773f67c8 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
@@ -10,7 +10,6 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
index 5ad529e6..c573a352 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
@@ -10,7 +10,6 @@
     {% endif %}
   </ul>
   {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
 {% endblock %}
 
 {% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
index d14abaa2..f12cb1cc 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
@@ -1,11 +1,6 @@
 {% extends "chrono/manager_agenda_day_view.html" %}
 {% load i18n %}
 
-{% block actions %}
-  {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
-{% endblock %}
-
 {% block content %}
 
   {% for period, desk_infos in view.get_timetable_infos %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
index b977c14d..785a55f4 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
@@ -1,11 +1,6 @@
 {% extends "chrono/manager_agenda_month_view.html" %}
 {% load i18n %}
 
-{% block actions %}
-  {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
-{% endblock %}
-
 {% block content %}
   {% include "chrono/manager_meetings_agenda_week_timetable_fragment.html" %}
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
index d1f34fd0..a7062809 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
@@ -1,11 +1,6 @@
 {% extends "chrono/manager_agenda_week_view.html" %}
 {% load i18n %}
 
-{% block actions %}
-  {{ block.super }}
-  {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
-{% endblock %}
-
 {% block content %}
   {% include "chrono/manager_meetings_agenda_week_timetable_fragment.html" %}
 {% endblock %}
diff --git a/chrono/manager/views.py b/chrono/manager/views.py
index 57c3dbfa..adfc9476 100644
--- a/chrono/manager/views.py
+++ b/chrono/manager/views.py
@@ -1299,6 +1299,7 @@ class AgendaDateView(DateMixin, ViewableAgendaMixin):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['agenda'] = self.agenda
+        context['kind'] = self.kind
         if self.agenda.kind != 'events':
             try:
                 context['hour_span'] = max(60 // self.agenda.get_base_meeting_duration(), 1)
@@ -1342,6 +1343,8 @@ class AgendaDateView(DateMixin, ViewableAgendaMixin):
 
 
 class AgendaDayView(AgendaDateView, DayArchiveView):
+    kind = 'day'
+
     def get_queryset(self):
         qs = super().get_queryset()
         if self.agenda.kind != 'events':
@@ -1516,7 +1519,6 @@ class AgendaWeekMonthMixin:
             ).all()
         else:
             context['single_desk'] = bool(len(self.agenda.prefetched_desks) == 1)
-        context['kind'] = self.kind
         return context
 
     def get_timetable_infos(self):