diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 08acf16c..91852800 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -4315,6 +4315,8 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     $('#timezone-display').appendTo($('.fc-header-center')).removeClass('hidden');
     $('#agendaoptions').detach().insertAfter('table.fc-header');
 
+    $('.content-frame-navigation a.button.date').appendTo('.content > .searchbar');
+
     // Mobile header title
     if (window.MutationObserver) {
       var title = $('.fc-header-title'),
diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index 6e204d31..c7c6bd6f 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -53,7 +53,7 @@
 		<roundcube:object name="plugin.agenda_options" id="agendaoptions" />
 		<div id="searchcontrols" class="search-controls"></div>
 	</div>
-	<div class="footer toolbar" role="toolbar" data-hidden="big">
+	<div class="footer toolbar content-frame-navigation" role="toolbar" data-hidden="big">
 		<a href="#" class="button prev" onclick="$('.fc-button-prev').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
 		<a href="#" class="button today" onclick="$('.fc-button-today').click()"><span class="inner"><roundcube:label name="today" /></span></a>
 		<a href="#" class="button date" onclick="window.calendar_datepicker()"><span class="inner"><roundcube:label name="date" /></span></a>
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index c37cc5c5..0061acaf 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1918,3 +1918,7 @@ body.task-calendar {
         color: @color-black-shade-text;
     }
 }
+
+.searchbar a.button.date:before {
+    line-height: 1.25;
+}