diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index ddff82cb..9a9f8912 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -176,7 +176,7 @@
 			<span class="header-title"><roundcube:label name="calendar.tabresources" /></span>
 		</div>
 		<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
-			wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
+			wrapper="searchbar menu" ariatag="h4" buttontitle="calendar.findresources"
 			label="resourcesearchform" label-domain="calendar" />
 		<div class="scroller">
 			<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />
diff --git a/plugins/kolab_files/skins/elastic/templates/compose_plugin.html b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html
index 28f99d2d..1937bf8b 100644
--- a/plugins/kolab_files/skins/elastic/templates/compose_plugin.html
+++ b/plugins/kolab_files/skins/elastic/templates/compose_plugin.html
@@ -6,7 +6,7 @@
 			<a class="button icon back" href="#back" data-hidden="big" onclick="$('#folderlistbox').hide();$('#filelistcontainer').css('display','flex')"><span class="inner"><roundcube:label name="back" /></span></a>
 			<span class="header-title"><roundcube:label name="folders" /></span>
 		</div>
-		<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar menu"
 			ariatag="h5" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 		<div id="files-folder-list" class="scroller"></div>
 	</div>
@@ -15,7 +15,7 @@
 			<a class="button icon folders" href="#sidebar" data-hidden="big" onclick="$('#filelistcontainer').hide();$('#folderlistbox').css('display','flex')"><span class="inner"><roundcube:label name="folders" /></span></a>
 			<span class="header-title" data-hidden="big" ><roundcube:label name="kolab_files.selectfiles" /></span>
 		</div>
-		<roundcube:object name="file-search-form" id="filesearchbox" wrapper="searchbar toolbar"
+		<roundcube:object name="file-search-form" id="filesearchbox" wrapper="searchbar menu"
 			label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
 			ariatag="h3" options="filesearchmenu" />
 		<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
index b4ba956d..3ae3128e 100644
--- a/plugins/kolab_files/skins/elastic/templates/files.html
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -64,7 +64,7 @@
 				data-popup="file-menu" innerclass="inner" />
 		</div>
 	</div>
-	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar menu"
 		label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
 		ariatag="h3" options="filesearchmenu" />
 	<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
diff --git a/plugins/kolab_files/skins/elastic/templates/message_plugin.html b/plugins/kolab_files/skins/elastic/templates/message_plugin.html
index b6372c3f..74a91d93 100644
--- a/plugins/kolab_files/skins/elastic/templates/message_plugin.html
+++ b/plugins/kolab_files/skins/elastic/templates/message_plugin.html
@@ -4,7 +4,7 @@
 		<span class="header-title" data-hidden="small"><roundcube:label name="folders" /></span>
 		<span class="header-title" data-hidden="big"><roundcube:label name="kolab_files.saveto" /></span>
 	</div>
-	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar menu"
 		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 	<h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
 	<div id="files-folder-list" class="scroller" aria-labelledby="aria-label-folderlist" data-no-collections="true"></div>
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index ecd14ddc..2171e659 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1249,10 +1249,6 @@ body.task-calendar {
     }
 }
 
-.task-calendar .content .searchbar {
-    border-color: @color-layout-border;
-}
-
 .searchbar a.button.date {
     @media screen and (min-width: (@screen-width-small + 1px)) {
         display: none;
@@ -1270,7 +1266,7 @@ body.task-calendar {
         }
     }
 
-    .sidebar .calendar-datepicker {
+    #layout-sidebar .calendar-datepicker {
         display: none;
     }
 
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 16c6fd89..d6bb6859 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -341,7 +341,12 @@ button.btn {
         }
 
         & > * {
-            display: initial;
+            display: block;
+        }
+
+        html.layout-small &,
+        html.layout-phone & {
+            overflow-y: auto !important;
         }
     }
 }