diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index 9c65e02c..6e204d31 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -8,6 +8,9 @@
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-calendars" class="header-title"><roundcube:label name="calendar.calendars" /></span>
+		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
+			title="calendar.calendaractions" class="button icon sidebar-menu" data-popup="calendaractions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
@@ -16,14 +19,6 @@
 	</div>
 	<h2 id="aria-label-minical" class="voice"><roundcube:label name="calendar.arialabelminical" /></h2>
 	<div id="datepicker" class="calendar-datepicker" role="presentation"></div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="calendar-create" type="link"
-			title="calendar.createcalendar" label="calendar.addcalendar"
-			class="button create disabled" classAct="button create" innerClass="inner" />
-		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
-			title="calendar.calendaractions" class="button actions" data-popup="calendaractions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- calendar -->
@@ -146,6 +141,7 @@
 <div id="calendaractions-menu" class="popupmenu">
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-calendaroptions">
+		<roundcube:button type="link-menuitem" command="calendar-create" label="calendar.addcalendar" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="calendar-edit" label="calendar.edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="calendar-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
@@ -178,10 +174,10 @@
 	<div class="resource-selection selection-list" role="navigation" aria-labelledby="aria-label-resourceselection">
 		<div class="header">
 			<span class="header-title"><roundcube:label name="calendar.tabresources" /></span>
-			<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
-				wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
-				label="resourcesearchform" label-domain="calendar" />
 		</div>
+		<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
+			wrapper="searchbar toolbar" 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" />
 		</div>
diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
index 5e4f16e9..111d52a9 100644
--- a/plugins/kolab_files/skins/elastic/templates/files.html
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -8,18 +8,13 @@
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-folders" class="header-title"><roundcube:label name="folders" /></span>
+		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
+			title="moreactions" label="actions"
+			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions-menu" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 	<div id="files-folder-list" class="scroller"></div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="folder-create" type="link"
-			title="kolab_files.foldercreate" label="kolab_files.addfolder"
-			class="button create disabled" classAct="button create" innerClass="inner" />
-		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
-			title="moreactions" label="actions"
-			class="button actions" innerClass="inner" data-popup="folderoptions-menu" />
-	</div>
 <roundcube:if condition="env:files_quota" />
 	<div class="footer toolbar small">
 		<div id="quotadisplay" class="quota-widget">
@@ -136,6 +131,7 @@
 <div id="folderoptions-menu" class="popupmenu" data-editable="true">
 	<h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-folderoptions">
+		<roundcube:button type="link-menuitem" command="folder-create" label="kolab_files.addfolder" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="folder-rename" label="rename" class="rename" classAct="rename active" />
 		<roundcube:button type="link-menuitem" command="files-folder-delete" label="delete" class="delete" classAct="delete active" />
 		<roundcube:if condition="!empty(env:external_sources)" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 07f6f4fb..89f1dcc4 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -8,19 +8,15 @@
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
+		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
+			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
 	<div id="notebooks-content" class="scroller">
 		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
 	</div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="list-create" type="link" title="kolab_notes.newnotebook"
-			class="button create disabled" classAct="button create" innerClass="inner" label="kolab_notes.addnotebook" />
-		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
-			title="kolab_notes.listactions" class="button actions" data-popup="notebookactions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- notes list -->
@@ -120,6 +116,7 @@
 <div id="notebookactions-menu" class="popupmenu">
 	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
+		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
index 0a317acc..06fd9b6c 100644
--- a/plugins/tasklist/skins/elastic/templates/mainview.html
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -8,19 +8,15 @@
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-tasklists" class="header-title"><roundcube:label name="tasklist.lists" /></span>
+		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
+			title="tasklist.listactions" class="button icon sidebar-menu" data-popup="tasklistactions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="tasklist" buttontitle="findlists" />
 	<div id="tasklists-content" class="scroller">
 		<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing iconized" />
 	</div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="list-create" type="link" title="tasklist.createlist"
-			class="button create disabled" classAct="button create" innerClass="inner" label="tasklist.createlist" />
-		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
-			title="tasklist.listactions" class="button actions" data-popup="tasklistactions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- tasks list -->
@@ -257,6 +253,7 @@
 <div id="tasklistactions-menu" class="popupmenu">
 	<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
+		<roundcube:button type="link-menuitem" command="list-create" label="tasklist.createlist" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:if condition="env:tasklist_driver == 'kolab'" />