From e13bdd55a7f4ad908f3758219eb19bc2be10be62 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 25 Mar 2019 12:27:51 +0100
Subject: [PATCH 1/6] Elastic: Catch up with layout refactoring in core

---
 plugins/calendar/calendar.php                 |  6 +--
 plugins/calendar/calendar_ui.js               |  4 +-
 .../skins/elastic/templates/calendar.html     | 18 +++----
 .../skins/elastic/templates/config.html       |  4 +-
 .../skins/elastic/templates/config.html       |  8 +--
 .../kolab_addressbook/kolab_addressbook.php   |  2 +-
 .../skins/elastic/templates/search_addon.html |  2 +-
 .../skins/elastic/templates/chat.html         |  4 +-
 .../skins/elastic/templates/settings.html     |  9 ++--
 .../skins/elastic/templates/docedit.html      | 27 ++++------
 .../skins/elastic/templates/filepreview.html  | 35 ++++++-------
 .../skins/elastic/templates/files.html        | 52 +++++++++----------
 plugins/kolab_files/skins/elastic/ui.js       | 16 +++---
 plugins/kolab_notes/kolab_notes.php           |  4 +-
 .../skins/elastic/templates/notes.html        | 32 +++++-------
 plugins/kolab_tags/kolab_tags.js              |  2 +-
 .../skins/elastic/templates/ui.html           |  4 +-
 plugins/libcalendaring/libcalendaring.js      |  5 +-
 plugins/libcalendaring/libcalendaring.php     |  2 +-
 plugins/libkolab/libkolab.php                 |  4 +-
 .../skins/elastic/include/calendar.less       |  4 +-
 .../skins/elastic/include/kolab_files.less    | 30 ++++++-----
 .../skins/elastic/include/kolab_notes.less    |  2 +-
 .../skins/elastic/include/kolab_tags.less     |  2 +-
 .../skins/elastic/include/tasklist.less       |  6 +--
 plugins/libkolab/skins/elastic/libkolab.less  | 10 ++--
 .../skins/elastic/templates/attachment.html   |  8 +--
 .../skins/elastic/templates/mainview.html     | 38 +++++++-------
 plugins/tasklist/tasklist.php                 |  6 +--
 29 files changed, 162 insertions(+), 184 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 1a03fd34..bb25f554 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -188,13 +188,13 @@ class calendar extends rcube_plugin
 
       // add 'Create event' item to message menu
       if ($this->api->output->type == 'html' && $_GET['_rel'] != 'event') {
-        $this->api->add_content(html::tag('li', null, 
+        $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
           $this->api->output->button(array(
             'command'  => 'calendar-create-from-mail',
             'label'    => 'calendar.createfrommail',
             'type'     => 'link',
             'classact' => 'icon calendarlink active',
-            'class'    => 'icon calendarlink',
+            'class'    => 'icon calendarlink disabled',
             'innerclass' => 'icon calendar',
           ))),
           'messagemenu');
@@ -2964,7 +2964,7 @@ class calendar extends rcube_plugin
         'type'       => 'link',
         'wrapper'    => 'li',
         'command'    => 'attachment-save-calendar',
-        'class'      => 'icon calendarlink',
+        'class'      => 'icon calendarlink disabled',
         'classact'   => 'icon calendarlink active',
         'innerclass' => 'icon calendar',
         'label'      => 'calendar.savetocalendar',
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 6db0ad79..2b620749 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -4226,7 +4226,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
         }
         dp.height('auto').removeClass('ui-dialog-content ui-widget-content')
           .data('dialog-parent', dp.closest('.ui-dialog'))
-          .appendTo('#layout > div.sidebar');
+          .appendTo('#layout-sidebar');
       }
       else if (!in_dialog && dp.length && width <= 768 && dp.data('dialog-parent')) {
         dp.addClass('ui-dialog-content ui-widget-content')
@@ -4284,7 +4284,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     // Mobile header title
     if (window.MutationObserver) {
       var title = $('.fc-header-toolbar > .fc-center h2'),
-        mobile_header = $('#layout > .content > .header > .header-title'),
+        mobile_header = $('#layout-content > .header > .header-title'),
         callback = function() {
           var text = title.text();
           mobile_header.html('').append([
diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index 34846859..ddff82cb 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
 
 <!-- calendars list -->
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-calendars">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-calendars">
 	<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>
@@ -12,7 +12,7 @@
 			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"
+	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar menu"
 		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
 	<div id="calendars-content" class="scroller">
 		<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing iconized" />
@@ -22,14 +22,14 @@
 </div>
 
 <!-- calendar -->
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="calendar.calendars" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div id="calendartoolbar" class="toolbar">
+		<div id="calendartoolbar" class="toolbar menu">
 			<roundcube:button command="addevent" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="calendar.new_event" innerClass="inner" />
@@ -46,14 +46,14 @@
 			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="searchform" buttontitle="calendar.findevents" label-domain="calendar" ariatag="h2" />
 	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
 	<div id="calendar" class="content" role="main" aria-labelledby="aria-label-calendarview" data-elastic-mode="true">
 		<roundcube:object name="plugin.agenda_options" id="agendaoptions" />
 		<div id="searchcontrols" class="search-controls"></div>
 	</div>
-	<div class="footer toolbar content-frame-navigation" role="toolbar" data-hidden="big">
+	<div class="footer toolbar menu content-frame-navigation" role="toolbar" data-hidden="big">
 		<a href="#" class="button prev" onclick="$('.fc-prev-button').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
 		<a href="#" class="button today" onclick="$('.fc-today-button').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>
@@ -140,7 +140,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">
+	<ul class="menu 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.editcalendar" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="calendar-delete" label="calendar.deletecalendar" class="delete disabled" classAct="delete active" />
@@ -159,7 +159,7 @@
 
 <div id="eventoptionsmenu" class="popupmenu">
 	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-eventoptions">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-eventoptions">
 		<roundcube:button type="link-menuitem" command="event-download" label="download" class="download disabled" classAct="download active" />
 		<roundcube:button type="link-menuitem" command="event-sendbymail" label="send" class="send disabled" classAct="send active" />
 		<roundcube:button type="link-menuitem" command="event-copy" label="copy" class="copy disabled" classAct="copy active" />
diff --git a/plugins/kolab_2fa/skins/elastic/templates/config.html b/plugins/kolab_2fa/skins/elastic/templates/config.html
index 6b76b8fc..9d32942c 100644
--- a/plugins/kolab_2fa/skins/elastic/templates/config.html
+++ b/plugins/kolab_2fa/skins/elastic/templates/config.html
@@ -4,12 +4,12 @@
 
 <h1 class="voice"><roundcube:label name="kolab_2fa.settingstitle" /></h1>
 
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"><roundcube:label name="kolab_2fa.settingstitle" /></span>
-		<div class="toolbar"></div>
+		<div class="toolbar menu"></div>
 	</div>
 	<div class="scroller frame-content">
 		<p class="addfactor">
diff --git a/plugins/kolab_activesync/skins/elastic/templates/config.html b/plugins/kolab_activesync/skins/elastic/templates/config.html
index 00983278..04079364 100644
--- a/plugins/kolab_activesync/skins/elastic/templates/config.html
+++ b/plugins/kolab_activesync/skins/elastic/templates/config.html
@@ -5,7 +5,7 @@
 <h1 class="voice"><roundcube:label name="kolab_activesync.tabtitle" /></h1>
 
 <!-- devices list -->
-<div class="list listbox selected" aria-labelledby="aria-label-deviceslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-deviceslist">
 	<div class="header">
 		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
 		<span id="aria-label-deviceslist" class="header-title"><roundcube:label name="kolab_activesync.devices" /></span>
@@ -18,15 +18,15 @@
 </div>
 
 <!-- device info frame -->
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div class="toolbar">
+		<div class="toolbar menu">
 			<roundcube:button command="plugin.delete-device" type="link"
-				class="button delete disabled" classAct="button delete"
+				class="delete disabled" classAct="button delete"
 				label="delete" title="kolab_activesync.deletedevice" innerclass="inner" />
 		</div>
 	</div>
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 37178d0f..b7818943 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -88,7 +88,7 @@ class kolab_addressbook extends rcube_plugin
                 if ($this->bonnie_api) {
                     $this->add_button(array(
                         'command'    => 'contact-history-dialog',
-                        'class'      => 'history contact-history',
+                        'class'      => 'history contact-history disabled',
                         'classact'   => 'history contact-history active',
                         'innerclass' => 'icon inner',
                         'label'      => 'kolab_addressbook.showhistory',
diff --git a/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html b/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html
index 5b883ae4..5f32fa24 100644
--- a/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html
+++ b/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html
@@ -1,4 +1,4 @@
-<roundcube:object name="libkolab.folder_search_form" id="addressbooksearch" wrapper="searchbar toolbar"
+<roundcube:object name="libkolab.folder_search_form" id="addressbooksearch" wrapper="searchbar menu"
 	ariatag="h2" label="foldersearchform" label-domain="kolab_addressbook" buttontitle="findaddressbooks" />
 
 <script>
diff --git a/plugins/kolab_chat/skins/elastic/templates/chat.html b/plugins/kolab_chat/skins/elastic/templates/chat.html
index 7ba09688..111e173d 100644
--- a/plugins/kolab_chat/skins/elastic/templates/chat.html
+++ b/plugins/kolab_chat/skins/elastic/templates/chat.html
@@ -3,9 +3,9 @@
 
 <h1 class="voice"><roundcube:label name="kolab_chat.chat" /></h1>
 
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<div class="header" data-hidden="lbs">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<span class="header-title"><roundcube:label name="kolab_chat.chat" /></span>
 	</div>
 	<div class="iframe-wrapper">
diff --git a/plugins/kolab_delegation/skins/elastic/templates/settings.html b/plugins/kolab_delegation/skins/elastic/templates/settings.html
index a32b300c..939f45d6 100644
--- a/plugins/kolab_delegation/skins/elastic/templates/settings.html
+++ b/plugins/kolab_delegation/skins/elastic/templates/settings.html
@@ -5,7 +5,7 @@
 <h1 class="voice"><roundcube:label name="kolab_delegation.tabtitle" /></h1>
 
 <!-- devices list -->
-<div class="list listbox selected" aria-labelledby="aria-label-delegateslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-delegateslist">
 	<div class="header">
 		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
 		<span id="aria-label-delegateslist" class="header-title"><roundcube:label name="kolab_delegation.delegates" /></span>
@@ -15,19 +15,16 @@
 		<roundcube:object name="plugin.delegatelist" id="delegate-table" class="listing" role="listbox"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="delegate-add" />
 	</div>
-<!--
-	<div class="footer"></div>
--->
 </div>
 
 <!-- delegatee info frame -->
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div class="toolbar">
+		<div class="toolbar menu">
 			<roundcube:button command="delegate-add" type="link"
 				label="create" title="kolab_delegation.adddelegate"
 				class="button create disabled" classAct="button create" innerClass="inner" />
diff --git a/plugins/kolab_files/skins/elastic/templates/docedit.html b/plugins/kolab_files/skins/elastic/templates/docedit.html
index e241c8e5..edb9152f 100644
--- a/plugins/kolab_files/skins/elastic/templates/docedit.html
+++ b/plugins/kolab_files/skins/elastic/templates/docedit.html
@@ -2,32 +2,28 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="content selected editor-<roundcube:var name="env:editor_type" />">
+<div id="layout-content" class="selected editor-<roundcube:var name="env:editor_type" />">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header document-editor-header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon members" href="#members" onclick="kolab_files_members_list(this)" data-hidden="big">
 			<span class="inner"><roundcube:label name="kolab_files.arialabelcollaborators"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div class="toolbar">
-			<roundcube:button command="document-close" type="link"
-				class="button delete disabled" classAct="button delete"
+		<div class="toolbar menu">
+			<roundcube:button command="document-close" type="link" class="delete disabled" classAct="delete"
 				label="kolab_files.terminate" title="kolab_files.terminatesession" innerClass="inner" />
 			<span class="dropbutton">
-				<roundcube:button command="document-export" type="link"
-					class="button export disabled" classAct="button export"
+				<roundcube:button command="document-export" type="link" class="export disabled" classAct="export"
 					label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
-				<a href="#export" class="button dropdown" id="exportmenulink" data-popup="export-menu" tabindex="0">
+				<a href="#export" class="dropdown" id="exportmenulink" data-popup="export-menu" tabindex="0">
 					<span class="inner"><roundcubemail:label name="kolab_files.exportoptions" /><span>
 				</a>
 			</span>
 			<roundcube:if condition="env:editor_type == 'wopi'" />
-				<roundcube:button command="document-print" type="link"
-					class="button print disabled" classAct="button print"
+				<roundcube:button command="document-print" type="link" class="print disabled" classAct="print"
 					label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
 			<roundcube:endif />
-			<roundcube:button command="document-save" type="link"
-				class="button save disabled" classAct="button save"
+			<roundcube:button command="document-save" type="link" class="save disabled" classAct="save"
 				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" data-hidden="small" />
 		</div>
 		<roundcube:if condition="env:editor_type != 'wopi'" />
@@ -48,18 +44,17 @@
 		<roundcube:object name="filepreviewframe" id="fileframe" role="main"
 			title="kolab_files.arialabelfilecontent" aria-labelledby="aria-label-filecontent" />
 	</div>
-	<div class="footer toolbar hidden-big">
-		<roundcube:button command="document-save" type="link"
-			class="button save disabled" classAct="button save"
+	<div class="footer toolbar menu hidden-big">
+		<roundcube:button command="document-save" type="link" class="save disabled" classAct="save"
 			label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" />
 		<roundcube:button name="close-window" type="link" onclick="parent.$('.ui-dialog:visible button.cancel').click()"
-			class="button cancel" label="cancel" title="cancel" innerClass="inner" />
+			class="cancel" label="cancel" title="cancel" innerClass="inner" />
 	</div>
 </div>
 
 <div id="export-menu" class="popupmenu">
 	<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
-	<ul id="exportmenu-menu" class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
+	<ul id="exportmenu-menu" class="menu listing" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
 </div>
 
 <div id="document-editors-dialog" class="popupmenu editors-dialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog">
diff --git a/plugins/kolab_files/skins/elastic/templates/filepreview.html b/plugins/kolab_files/skins/elastic/templates/filepreview.html
index 5ec0f30e..0dd8df1f 100644
--- a/plugins/kolab_files/skins/elastic/templates/filepreview.html
+++ b/plugins/kolab_files/skins/elastic/templates/filepreview.html
@@ -2,7 +2,7 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="sidebar listbox">
+<div id="layout-sidebar" class="listbox">
 	<div class="header">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
@@ -12,38 +12,33 @@
 	</div>
 </div>
 
-<div class="content selected">
+<div id="layout-content" class="selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
 			<span class="inner"><roundcube:label name="properties"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div id="filetoolbar" class="toolbar">
-			<roundcube:button command="files-get" type="link"
-				class="button download disabled" classAct="button download"
+		<div id="filetoolbar" class="toolbar menu">
+			<roundcube:button command="files-get" type="link" class="download disabled" classAct="download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
-			<roundcube:button command="files-edit" type="link"
-				class="button edit disabled" classAct="button edit"
+			<roundcube:button command="files-edit" type="link" class="edit disabled" classAct="edit"
 				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" data-hidden="small" />
-			<roundcube:button command="files-save" type="link"
-				class="button save disabled" classAct="button save"
+			<roundcube:button command="files-save" type="link" class="save disabled" classAct="save"
 				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" style="display:none" data-hidden="small" />
-			<roundcube:button command="files-delete" type="link"
-				class="button delete disabled" classAct="button delete"
+			<roundcube:button command="files-delete" type="link" class="delete disabled" classAct="delete"
 				label="delete" title="kolab_files.deletefile" innerClass="inner" />
-			<roundcube:button command="files-print" type="link"
-				class="button print disabled" classAct="button print"
+			<roundcube:button command="files-print" type="link" class="print disabled" classAct="print"
 				label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
 			<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 				<roundcube:button command="image-scale" type="link" prop="+" data-hidden="small"
-					class="button zoomin disabled" classAct="button zoomin"
+					class="zoomin disabled" classAct="zoomin"
 					label="zoomin" title="increaseimage" innerclass="inner" />
 				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
-					class="button zoomout disabled" classAct="button zoomout"
+					class="zoomout disabled" classAct="zoomout"
 					label="zoomout" title="decreaseimage" innerclass="inner" />
 				<roundcube:button command="image-rotate" type="link"
-					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					class="rotate disabled" classAct="rotate" data-hidden="small"
 					label="rotate" title="rotateimage" innerclass="inner" />
 			<roundcube:endif />
 		</div>
@@ -55,15 +50,15 @@
 <roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 	<div id="image-tools" class="image-tools" data-hidden="big">
 		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
-		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+		<div class="toolbar menu" role="menu" aria-labelledby="aria-label-imagetools">
 			<roundcube:button command="image-scale" type="link" prop="+"
-				class="button zoomin disabled" classAct="button zoomin"
+				class="zoomin disabled" classAct="zoomin"
 				label="zoomin" title="increaseimage" innerclass="inner" />
 			<roundcube:button command="image-scale" type="link" prop="-"
-				class="button zoomout disabled" classAct="button zoomout"
+				class="zoomout disabled" classAct="zoomout"
 				label="zoomout" title="decreaseimage" innerclass="inner" />
 			<roundcube:button command="image-rotate" type="link"
-				class="button rotate disabled" classAct="button rotate"
+				class="rotate disabled" classAct="rotate"
 				label="rotate" title="rotateimage" innerclass="inner" />
 		</div>
 		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"
diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
index 92730ba6..b4ba956d 100644
--- a/plugins/kolab_files/skins/elastic/templates/files.html
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
 
 <!-- folders list -->
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-folders">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-folders">
 	<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>
@@ -12,11 +12,11 @@
 			title="moreactions" label="actions"
 			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions" />
 	</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" />
 	<div id="files-folder-list" class="scroller"></div>
 <roundcube:if condition="env:files_quota" />
-	<div class="footer toolbar small">
+	<div class="footer small">
 		<div id="quotadisplay" class="quota-widget">
 			<span class="voice"><roundcube:label name="quota"></span>
 			<roundcube:object name="filequotadisplay" class="count" display="text" />
@@ -26,41 +26,41 @@
 </div>
 
 <!-- files -->
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="folders" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div id="filestoolbar" class="toolbar">
+		<div id="filestoolbar" class="toolbar menu">
 			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('files')"
-				label="options" class="button settings" innerClass="inner" />
+				label="options" class="settings" innerClass="inner" />
 			<roundcube:button id="sessionslistmenu-link" name="sessionslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('sessions')"
-				label="options" class="button hidden settings" innerClass="inner" />
+				label="options" class="hidden settings" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="files-upload" type="link" onclick="$('#filesuploadform').click()"
-				class="button upload disabled" classAct="button upload"
+				class="upload disabled" classAct="upload"
 				label="kolab_files.upload" title="kolab_files.uploadfile" innerClass="inner" />
 			<roundcube:button command="files-get" type="link"
-				class="button download disabled" classAct="button download"
+				class="download disabled" classAct="download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
 			<roundcube:button command="files-open" type="link"
-				class="button open disabled" classAct="button open"
+				class="open disabled" classAct="open"
 				label="kolab_files.view" title="kolab_files.viewfile" innerClass="inner" />
 			<roundcube:button command="files-edit" type="link"
-				class="button edit disabled" classAct="button edit"
+				class="edit disabled" classAct="edit"
 				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" />
 			<roundcube:button command="files-create" type="link" data-fab="true"
-				class="button create disabled" classAct="button create"
+				class="create disabled" classAct="create"
 				label="kolab_files.create" title="kolab_files.createfile" innerClass="inner "/>
 			<roundcube:button command="files-delete" type="link"
-				class="button delete disabled" classAct="button delete"
+				class="delete disabled" classAct="delete"
 				label="delete" title="kolab_files.deletefile" innerClass="inner" />
 			<roundcube:button name="filemenulink" id="filemenulink" type="link"
-				class="button more" label="more" title="moreactions"
+				class="more" label="more" title="moreactions"
 				data-popup="file-menu" innerclass="inner" />
 		</div>
 	</div>
@@ -130,16 +130,16 @@
 
 <div id="folderoptions" 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">
+	<ul class="menu 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="kolab_files.folderrename" class="rename" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="folder-rename" label="kolab_files.folderrename" class="rename disabled" classAct="rename active" />
 		<roundcube:if condition="env:files_api_version &gt; 3" />
-			<roundcube:button type="link-menuitem" command="folder-share" label="kolab_files.foldershare" class="share" classAct="share active" />
+			<roundcube:button type="link-menuitem" command="folder-share" label="kolab_files.foldershare" class="share disabled" classAct="share active" />
 		<roundcube:endif />
-		<roundcube:button type="link-menuitem" command="files-folder-delete" label="kolab_files.folderdelete" class="delete" classAct="delete active" />
-		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders" classAct="folders active" />
+		<roundcube:button type="link-menuitem" command="files-folder-delete" label="kolab_files.folderdelete" class="delete disabled" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 		<roundcube:if condition="!empty(env:external_sources)" />
-			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage" classAct="mount storage active" />
+			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage disabled" classAct="mount storage active" />
 		<roundcube:endif />
 	</ul>
 </div>
@@ -199,7 +199,7 @@
 </div>
 
 <div id="dragfilemenu" class="popupmenu">
-	<ul class="toolbarmenu listing" role="menu">
+	<ul class="menu listing" role="menu">
 		<roundcube:button type="link-menuitem" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" />
 		<roundcube:button type="link-menuitem" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" />
 	</ul>
@@ -207,10 +207,10 @@
 
 <div id="file-menu" class="popupmenu">
 	<h3 id="aria-label-message-menu" class="voice"><roundcube:label name="kolab_files.arialabelmorefileactions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-file-menu">
-		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename" classAct="rename active" />
-		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-file-menu">
+		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename disabled" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move disabled" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
+		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy disabled" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
 	</ul>
 </div>
 
diff --git a/plugins/kolab_files/skins/elastic/ui.js b/plugins/kolab_files/skins/elastic/ui.js
index 33edbb12..da2cd2c6 100644
--- a/plugins/kolab_files/skins/elastic/ui.js
+++ b/plugins/kolab_files/skins/elastic/ui.js
@@ -2,8 +2,8 @@ function kolab_files_enable_command(p)
 {
     if (p.command == 'files-save') {
         var toolbar = $('#toolbar-menu');
-        $('a.button.edit', toolbar).parent().hide();
-        $('a.button.save', toolbar).show().parent().show();
+        $('a.edit', toolbar).parent().hide();
+        $('a.save', toolbar).show().parent().show();
 
         if (window.editor_edit_button)
             window.editor_edit_button.addClass('hidden');
@@ -52,7 +52,7 @@ function kolab_files_members_list(link)
 {
     var dialog = $('<div id="members-dialog" class="session-members"><ul></ul></div>'),
         title = $(link).text(),
-        add_button = $('#collaborators a.button.add'),
+        add_button = $('#collaborators a.add'),
         save_func = function(e) {
             add_button.click();
             return true;
@@ -82,7 +82,7 @@ if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
     rcmail.addEventListener('enable-command', kolab_files_enable_command);
 
     if (rcmail.env.action == 'open') {
-        $('#toolbar-menu a.button.save').parent().hide();
+        $('#toolbar-menu a.save').parent().hide();
     }
     else if (rcmail.env.action == 'edit') {
         if (rcmail.env.editor_type == 'wopi' && rcmail.is_framed()) {
@@ -104,8 +104,8 @@ if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
 
     // Elastic mobile preview uses an iframe in a dialog
     if ((rcmail.env.action == 'open' || rcmail.env.editor_type != 'wopi') && rcmail.is_framed()) {
-        var edit_button = $('#filetoolbar a.button.edit'),
-            save_button = $('#filetoolbar a.button.save');
+        var edit_button = $('#filetoolbar a.edit'),
+            save_button = $('#filetoolbar a.save');
 
         parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
             window.editor_save_button = $('<button type="button">')
@@ -125,11 +125,11 @@ if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
 else {
     rcmail.addEventListener('files-folder-select', function(p) {
         var is_sess = p.folder == 'folder-collection-sessions';
-        $('#fileslistmenu-link, #layout > .content > .pagenav, #layout > .content .searchbar')[is_sess ? 'hide' : 'show']();
+        $('#fileslistmenu-link, #layout-content > .pagenav, #layout-content .searchbar')[is_sess ? 'hide' : 'show']();
         $('#sessionslistmenu-link')[is_sess ? 'removeClass' : 'addClass']('hidden');
 
         // set list header title for mobile
-        // $('#layout > .content > .header > .header-title').text($('#files-folder-list li.selected a.name:first').text());
+        // $('#layout-content > .header > .header-title').text($('#files-folder-list li.selected a.name:first').text());
     });
 }
 
diff --git a/plugins/kolab_notes/kolab_notes.php b/plugins/kolab_notes/kolab_notes.php
index d0547ede..34f0d3c5 100644
--- a/plugins/kolab_notes/kolab_notes.php
+++ b/plugins/kolab_notes/kolab_notes.php
@@ -96,13 +96,13 @@ class kolab_notes extends rcube_plugin
 
             // add 'Append note' item to message menu
             if ($this->api->output->type == 'html' && $_REQUEST['_rel'] != 'note') {
-                $this->api->add_content(html::tag('li', null, 
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                       'command'  => 'append-kolab-note',
                       'label'    => 'kolab_notes.appendnote',
                       'type'     => 'link',
                       'classact' => 'icon appendnote active',
-                      'class'    => 'icon appendnote',
+                      'class'    => 'icon appendnote disabled',
                       'innerclass' => 'icon note',
                     ))),
                     'messagemenu');
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 20dc2976..8df79a69 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
 
 <!-- notebooks list -->
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<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>
@@ -12,7 +12,7 @@
 			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"
+	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar menu"
 		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" />
@@ -20,18 +20,18 @@
 </div>
 
 <!-- notes list -->
-<div class="list listbox selected" aria-labelledby="aria-label-noteslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-noteslist">
 	<div class="header">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
-		<div id="listcontrols" class="toolbar" role="toolbar">
+		<div id="listcontrols" class="toolbar menu" role="toolbar">
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
 	<div class="scroller">
 		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
@@ -43,30 +43,26 @@
 </div>
 
 <!-- note details frame -->
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div id="notestoolbar" class="toolbar">
-			<roundcube:button command="createnote" type="link"
-				class="button create disabled" classAct="button create"
+		<div id="notestoolbar" class="toolbar menu">
+			<roundcube:button command="createnote" type="link" class="create disabled" classAct="create"
 				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
-			<roundcube:button command="print" type="link" data-hidden="small"
-				class="button print disabled" classAct="button print"
+			<roundcube:button command="print" type="link" class="print disabled" classAct="print" data-hidden="small"
 				label="print" title="print" innerClass="inner" />
-			<roundcube:button command="delete" type="link"
-				class="button delete disabled" classAct="button delete"
+			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
 				title="delete" label="delete" innerClass="inner" />
 			<span class="spacer"></span>
-			<roundcube:button command="sendnote" type="link"
-				class="button send disabled" classAct="button send"
+			<roundcube:button command="sendnote" type="link" class="send disabled" classAct="send"
 				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
 			<roundcube:container name="toolbar" id="notestoolbar" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="history" type="link"
-					class="button history note-history disabled" classAct="button history note-history"
+					class="history note-history disabled" classAct="history note-history"
 					label="libkolab.objectchangelog" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 		</div>
@@ -117,7 +113,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">
+	<ul class="menu 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="kolab_notes.editlist" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="kolab_notes.deletelist" class="delete disabled" classAct="delete active" />
diff --git a/plugins/kolab_tags/kolab_tags.js b/plugins/kolab_tags/kolab_tags.js
index ffdd8702..d9b59216 100644
--- a/plugins/kolab_tags/kolab_tags.js
+++ b/plugins/kolab_tags/kolab_tags.js
@@ -899,7 +899,7 @@ function tag_selector(event, callback, remove_mode)
 
     if (!container) {
         var rows = [],
-            ul = $('<ul class="toolbarmenu">'),
+            ul = $('<ul class="toolbarmenu menu">'),
             li = document.createElement('li'),
             link = document.createElement('a'),
             span = document.createElement('span');
diff --git a/plugins/kolab_tags/skins/elastic/templates/ui.html b/plugins/kolab_tags/skins/elastic/templates/ui.html
index 996bc6ac..f0044ae7 100644
--- a/plugins/kolab_tags/skins/elastic/templates/ui.html
+++ b/plugins/kolab_tags/skins/elastic/templates/ui.html
@@ -6,7 +6,7 @@
 </div>
 
 <div id="tagsmenu" class="popupmenu" aria-hidden="true">
-	<ul class="toolbarmenu iconized">
+	<ul class="menu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
 		<roundcube:button type="link-menuitem" command="reset-tags" label="kolab_tags.unset" class="tags reset disabled" classAct="tags reset active" />
 		<roundcube:button type="link-menuitem" command="manage-tags" label="kolab_tags.manage" class="tags disabled" classAct="tags active" />
@@ -15,7 +15,7 @@
 </div>
 
 <div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
-	<ul class="toolbarmenu iconized">
+	<ul class="menu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
 		<roundcube:button type="link-menuitem" command="tag-add" label="kolab_tags.tagadd" classAct="tag add active" class="tag add disabled" />
 		<roundcube:button type="link-menuitem" command="tag-remove" label="kolab_tags.tagremove" classAct="tag remove active" class="tag remove disabled" />
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index b49fac10..f27c95af 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -1318,12 +1318,11 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
  */
 rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback, event)
 {
-    var list, lc, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
+    var list, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
 
     if (!menu.length) {
-        lc = $('body > #layout').length === 1 ? 'toolbarmenu listing' : 'toolbarmenu';
         menu = $('<div>').attr({'class': 'popupmenu', id: 'itip-rsvp-menu', 'aria-hidden': 'true'}).appendTo(document.body);
-        list = $('<ul>').attr({'class': lc, role: 'menu'}).appendTo(menu);
+        list = $('<ul>').attr({'class': 'toolbarmenu menu', role: 'menu'}).appendTo(menu);
 
         $.each(['all','current'/*,'future'*/], function(i, mode) {
             var link = $('<a>').attr({'class': 'active', rel: mode})
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index a35c73f8..3fb65cff 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -761,7 +761,7 @@ class libcalendaring extends rcube_plugin
                 $this->gettext(array('name' => $label, 'vars' => array('min' => $n % 60, 'hrs' => intval($n / 60))))));
         }
 
-        return html::tag('ul', $attrib + array('class' => 'toolbarmenu'), join("\n", $items), html::$common_attrib);
+        return html::tag('ul', $attrib + array('class' => 'toolbarmenu menu'), join("\n", $items), html::$common_attrib);
     }
 
 
diff --git a/plugins/libkolab/libkolab.php b/plugins/libkolab/libkolab.php
index 0d96bf7f..3aa6fbfb 100644
--- a/plugins/libkolab/libkolab.php
+++ b/plugins/libkolab/libkolab.php
@@ -69,13 +69,13 @@ class libkolab extends rcube_plugin
                 $this->include_script('libkolab.js');
 
                 // add 'Show history' item to message menu
-                $this->api->add_content(html::tag('li', null,
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                         'command'  => 'kolab-mail-history',
                         'label'    => 'libkolab.showhistory',
                         'type'     => 'link',
                         'classact' => 'icon history active',
-                        'class'    => 'icon history',
+                        'class'    => 'icon history disabled',
                         'innerclass' => 'icon history',
                     ))),
                     'messagemenu');
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 4acae1bf..0247580f 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.toolbarmenu.listing li {
+.menu.listing li {
     a.calendarlink:before {
         .font-icon-regular(@fa-var-calendar);
     }
@@ -652,7 +652,7 @@ body.task-calendar {
     }
 
     @media screen and (min-width: (@screen-width-small + 1px)) {
-        & > #layout > div.sidebar {
+        #layout-sidebar {
             flex: 2 !important;
             max-width: 400px;
         }
diff --git a/plugins/libkolab/skins/elastic/include/kolab_files.less b/plugins/libkolab/skins/elastic/include/kolab_files.less
index d88e8ef4..7231aad9 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_files.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_files.less
@@ -29,24 +29,26 @@ a.button.saveas:before {
     content: @fa-var-folder;
 }
 
-.toolbarmenu.listing li a.mount.storage:before {
-    content: @fa-var-database;
-}
+.menu {
+    a.mount.storage:before {
+        content: @fa-var-database;
+    }
 
-.toolbar a.button.open:before {
-    content: @fa-var-eye;
-}
+    a.open:before {
+        content: @fa-var-eye;
+    }
 
-.toolbar a.button.rename:before {
-    content: @fa-var-pen-square;
-}
+    a.rename:before {
+        content: @fa-var-pen-square;
+    }
 
-.toolbar a.button.cancel:before {
-    content: @fa-var-times;
-}
+    a.cancel:before {
+        content: @fa-var-times;
+    }
 
-.listing li a.share:before {
-    content: @fa-var-share-alt;
+    a.share:before {
+        content: @fa-var-share-alt;
+    }
 }
 
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset a.btn-link.options.add-folder {
diff --git a/plugins/libkolab/skins/elastic/include/kolab_notes.less b/plugins/libkolab/skins/elastic/include/kolab_notes.less
index 7f09a93c..3e661dd6 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_notes.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_notes.less
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.toolbarmenu.listing li {
+.menu.listing li {
     a.appendnote:before {
         .font-icon-regular(@fa-var-sticky-note);
     }
diff --git a/plugins/libkolab/skins/elastic/include/kolab_tags.less b/plugins/libkolab/skins/elastic/include/kolab_tags.less
index 26b8c8bb..3cceff91 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_tags.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_tags.less
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.toolbarmenu.listing li {
+.menu.listing li {
     a.tags:before {
         content: @fa-var-tags;
     }
diff --git a/plugins/libkolab/skins/elastic/include/tasklist.less b/plugins/libkolab/skins/elastic/include/tasklist.less
index 1a220467..331f49d5 100644
--- a/plugins/libkolab/skins/elastic/include/tasklist.less
+++ b/plugins/libkolab/skins/elastic/include/tasklist.less
@@ -21,11 +21,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#taskmenu a.tasklist:before {
-    content: @fa-var-calendar-check;
-}
 
-.toolbarmenu.listing li {
+.menu li {
+    a.tasklist:before,
     a.tasklistlink:before,
     a.taskaddlink:before {
         .font-icon-regular(@fa-var-calendar-check);
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 221628cd..7559578f 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -279,7 +279,7 @@ html.touch .listing {
     }
 }
 
-.toolbarmenu.listing li {
+.menu.listing li {
     &.search {
         padding: .25rem .5rem;
         .input-group {
@@ -529,7 +529,8 @@ button.btn.print:before {
 
 // Use icons-only on taskmenu with small screen height
 @media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
-    body > #layout > .menu {
+    #layout-menu .popover-header img,
+    #layout-menu {
         width: 2.5rem;
     }
 
@@ -537,11 +538,6 @@ button.btn.print:before {
         a {
             height: auto;
             width: 100%;
-
-            &:before {
-                height: 2.1rem;
-                width: 100%;
-            }
         }
 
         .special-buttons {
diff --git a/plugins/libkolab/skins/elastic/templates/attachment.html b/plugins/libkolab/skins/elastic/templates/attachment.html
index 896c6534..5812e7ae 100644
--- a/plugins/libkolab/skins/elastic/templates/attachment.html
+++ b/plugins/libkolab/skins/elastic/templates/attachment.html
@@ -2,7 +2,7 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="sidebar listbox">
+<div id="layout-sidebar" class="listbox">
 	<div class="header">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
@@ -13,14 +13,14 @@
 	</div>
 </div>
 
-<div class="content selected">
+<div id="layout-content" class="selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
 			<span class="inner"><roundcube:label name="properties"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div id="messagetoolbar" class="toolbar">
+		<div id="messagetoolbar" class="toolbar menu">
 			<roundcube:button command="download-attachment" type="link" label="download" title="download"
 				class="button download disabled" classAct="button download" innerclass="inner" />
 			<roundcube:button command="print-attachment" type="link" label="print" title="print"
@@ -46,7 +46,7 @@
 <roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 	<div id="image-tools" class="image-tools" data-hidden="big">
 		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
-		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+		<div class="toolbar menu" role="menu" aria-labelledby="aria-label-imagetools">
 			<roundcube:button command="image-scale" type="link" prop="+"
 				class="button zoomin disabled" classAct="button zoomin"
 				label="zoomin" title="increaseimage" innerclass="inner" />
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
index 9845fd77..800510cb 100644
--- a/plugins/tasklist/skins/elastic/templates/mainview.html
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
 
 <!-- task folders list -->
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<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>
@@ -12,7 +12,7 @@
 			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"
+	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar menu"
 		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" />
@@ -20,21 +20,21 @@
 </div>
 
 <!-- tasks list -->
-<div class="list listbox selected" aria-labelledby="aria-label-taskslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-taskslist">
 	<div class="header">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="tasklist.lists" /></span></a>
 		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
-		<div id="listcontrols" class="toolbar" role="toolbar">
+		<div id="listcontrols" class="toolbar menu" role="toolbar">
 			<a href="#threads" class="button threads active" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
-	<div class="pagenav pagenav-list toolbar" onclick="UI.switch_nav_list(this)">
+	<div class="pagenav pagenav-list menu" onclick="UI.switch_nav_list(this)">
 		<a class="button icon expand"><span class="inner"></span></a>
 		<span id="taskselector-name" class="pagenav-text"><roundcube:label name="tasklist.all" /></span>
 	</div>
@@ -67,33 +67,33 @@
 </div>
 
 <!-- task details frame -->
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
-		<div id="taskstoolbar" class="toolbar">
+		<div id="taskstoolbar" class="toolbar menu">
 			<roundcube:button command="newtask" type="link"
-				class="button create disabled" classAct="button create"
+				class="create disabled" classAct="create"
 				label="create" title="tasklist.newtask" innerClass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
-				class="button print disabled" classAct="button print"
+				class="print disabled" classAct="print"
 				label="print" title="tasklist.printtitle" innerClass="inner" />
 			<roundcube:button command="delete-task" type="link"
 				label="delete" title="tasklist.deletetask"
-				class="button delete disabled" classAct="button delete" innerclass="inner" />
+				class="delete disabled" classAct="delete" innerclass="inner" />
 			<span class="spacer"></span>
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="task-history" type="link"
-					class="button history task-history disabled" classAct="button history task-history"
+					class="history task-history disabled" classAct="history task-history"
 					label="tasklist.taskhistory" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 			<roundcube:button command="import" type="link"
-				class="button import disabled" classAct="button import"
+				class="import disabled" classAct="import"
 				label="import" title="tasklist.importtasks" innerClass="inner" />
 			<roundcube:button command="export" type="link"
-				class="button export disabled" classAct="button export"
+				class="export disabled" classAct="export"
 				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
@@ -253,7 +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">
+	<ul class="menu 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="tasklist.editlist" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="tasklist.deletelist" class="delete disabled" classAct="delete active" />
@@ -298,9 +298,9 @@
 
 <div id="threadselect-menu" class="popupmenu">
 	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
-		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all" classAct="expand all active" />
-		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none" classAct="expand none active" />
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
+		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" />
+		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" />
 	</ul>
 </div>
 
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index d024890e..a471e734 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -141,13 +141,13 @@ class tasklist extends rcube_plugin
 
             // add 'Create event' item to message menu
             if ($this->api->output->type == 'html' && $_GET['_rel'] != 'task') {
-                $this->api->add_content(html::tag('li', null, 
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                         'command'  => 'tasklist-create-from-mail',
                         'label'    => 'tasklist.createfrommail',
                         'type'     => 'link',
                         'classact' => 'icon taskaddlink active',
-                        'class'    => 'icon taskaddlink',
+                        'class'    => 'icon taskaddlink disabled',
                         'innerclass' => 'icon taskadd',
                     ))),
                 'messagemenu');
@@ -1910,7 +1910,7 @@ class tasklist extends rcube_plugin
                 'type'       => 'link',
                 'wrapper'    => 'li',
                 'command'    => 'attachment-save-task',
-                'class'      => 'icon tasklistlink',
+                'class'      => 'icon tasklistlink disabled',
                 'classact'   => 'icon tasklistlink active',
                 'innerclass' => 'icon taskadd',
                 'label'      => 'tasklist.savetotasklist',

From a99b0de248aaa49467dd42b50bcc4e555547b78a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 26 Mar 2019 09:49:04 +0100
Subject: [PATCH 2/6] Elastic: Simplified some css rules

---
 .../skins/elastic/include/calendar.less       | 14 ++++++-----
 .../skins/elastic/include/kolab_tags.less     |  3 ++-
 .../skins/elastic/include/tasklist.less       |  2 +-
 plugins/libkolab/skins/elastic/libkolab.less  | 25 +++++++------------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 0247580f..31efaa5f 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.menu.listing li {
+.menu {
     a.calendarlink:before {
         .font-icon-regular(@fa-var-calendar);
     }
@@ -36,12 +36,14 @@
     content: @fa-var-cube;
 }
 
-a.button.today:before {
-    .font-icon-regular(@fa-var-calendar);
-}
+a.button {
+    &.today:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
 
-a.button.date:before {
-    .font-icon-regular(@fa-var-calendar-alt);
+    &.date:before {
+        .font-icon-regular(@fa-var-calendar-alt);
+    }
 }
 
 .listing {
diff --git a/plugins/libkolab/skins/elastic/include/kolab_tags.less b/plugins/libkolab/skins/elastic/include/kolab_tags.less
index 3cceff91..527c84bf 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_tags.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_tags.less
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.menu.listing li {
+.menu {
     a.tags:before {
         content: @fa-var-tags;
     }
@@ -36,6 +36,7 @@
 #taglist {
     li {
         padding: 0 .5rem;
+
         &:before {
             &:extend(.font-icon-class);
             content: @fa-var-tag;
diff --git a/plugins/libkolab/skins/elastic/include/tasklist.less b/plugins/libkolab/skins/elastic/include/tasklist.less
index 331f49d5..9733d406 100644
--- a/plugins/libkolab/skins/elastic/include/tasklist.less
+++ b/plugins/libkolab/skins/elastic/include/tasklist.less
@@ -22,7 +22,7 @@
  */
 
 
-.menu li {
+.menu {
     a.tasklist:before,
     a.tasklistlink:before,
     a.taskaddlink:before {
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 7559578f..2fadb70b 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -279,8 +279,8 @@ html.touch .listing {
     }
 }
 
-.menu.listing li {
-    &.search {
+.menu {
+    li.search {
         padding: .25rem .5rem;
         .input-group {
 
@@ -300,12 +300,13 @@ html.touch .listing {
     }
 }
 
-a.history {
-    &:before {
-        &:extend(.font-icon-class);
-        content: @fa-var-history;
-        display: inline;
-        float: none;
+button.btn {
+    &.save.notify:before {
+        content: @fa-var-envelope;
+    }
+
+    &.print:before {
+        content: @fa-var-print;
     }
 }
 
@@ -375,14 +376,6 @@ a.history {
     }
 }
 
-button.btn.save.notify:before {
-    content: @fa-var-envelope;
-}
-
-button.btn.print:before {
-    content: @fa-var-print;
-}
-
 .formcontent.text-only .faded * {
     color: @color-black-shade-text;
 }

From 6b7b6ce71599d45fe93cf088c78e43bb8608791c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 26 Mar 2019 10:05:08 +0100
Subject: [PATCH 3/6] Elastic: Fix small regression

---
 plugins/calendar/calendar_ui.js                      | 2 +-
 plugins/libkolab/skins/elastic/include/calendar.less | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 2b620749..a6783287 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -4279,7 +4279,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     $('#timezone-display').appendTo($('.fc-header-toolbar > .fc-center')).removeClass('hidden');
     $('#agendaoptions').detach().insertAfter('.fc-header-toolbar');
 
-    $('.content-frame-navigation a.button.date').appendTo('.content > .searchbar');
+    $('.content-frame-navigation a.button.date').appendTo('#layout-content > .searchbar');
 
     // Mobile header title
     if (window.MutationObserver) {
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 31efaa5f..0333cea0 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1257,10 +1257,6 @@ body.task-calendar {
     @media screen and (min-width: (@screen-width-small + 1px)) {
         display: none;
     }
-
-    &:before {
-        line-height: 1.25;
-    }
 }
 
 @media screen and (max-width: @screen-width-small) {

From 3748f118150d0da51270557d2e718061cbb9f9d8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 26 Mar 2019 12:08:13 +0100
Subject: [PATCH 4/6] Elastic: Unify some icons

---
 plugins/libkolab/skins/elastic/include/calendar.less    | 2 +-
 plugins/libkolab/skins/elastic/include/kolab_notes.less | 4 ++--
 plugins/libkolab/skins/elastic/include/tasklist.less    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 0333cea0..ecd14ddc 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -23,7 +23,7 @@
 
 .menu {
     a.calendarlink:before {
-        .font-icon-regular(@fa-var-calendar);
+        content: @fa-var-calendar-alt;
     }
 
     a.send:before {
diff --git a/plugins/libkolab/skins/elastic/include/kolab_notes.less b/plugins/libkolab/skins/elastic/include/kolab_notes.less
index 3e661dd6..2d4fa4a7 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_notes.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_notes.less
@@ -21,9 +21,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.menu.listing li {
+.menu {
     a.appendnote:before {
-        .font-icon-regular(@fa-var-sticky-note);
+        content: @fa-var-sticky-note;
     }
 }
 
diff --git a/plugins/libkolab/skins/elastic/include/tasklist.less b/plugins/libkolab/skins/elastic/include/tasklist.less
index 9733d406..c7d6491c 100644
--- a/plugins/libkolab/skins/elastic/include/tasklist.less
+++ b/plugins/libkolab/skins/elastic/include/tasklist.less
@@ -26,7 +26,7 @@
     a.tasklist:before,
     a.tasklistlink:before,
     a.taskaddlink:before {
-        .font-icon-regular(@fa-var-calendar-check);
+        content: @fa-var-calendar-check;
     }
 }
 

From 17b31cab86c5e178a33a8c5fb99deae1ecc2d50f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 26 Mar 2019 13:46:14 +0100
Subject: [PATCH 5/6] Elastic: Fix regression in taskmenu on small window
 height

---
 plugins/libkolab/skins/elastic/libkolab.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 2fadb70b..16c6fd89 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -524,17 +524,18 @@ button.btn {
 @media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
     #layout-menu .popover-header img,
     #layout-menu {
-        width: 2.5rem;
+        width: @layout-menu-width-sm;
     }
 
     #taskmenu {
         a {
-            height: auto;
+            height: @layout-menu-width-sm;
             width: 100%;
+            font-size: 1.2rem !important;
         }
 
         .special-buttons {
-            width: 2.5rem;
+            width: @layout-menu-width-sm;
         }
 
         span.inner {

From 3c9caa4ce1472136a61a10d1e13bae49d88c7050 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Mon, 1 Apr 2019 10:28:49 +0200
Subject: [PATCH 6/6] Elastic: Fix small regression in document editor toolbar

---
 plugins/libkolab/skins/elastic/include/kolab_files.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/include/kolab_files.less b/plugins/libkolab/skins/elastic/include/kolab_files.less
index 7231aad9..f71430f1 100644
--- a/plugins/libkolab/skins/elastic/include/kolab_files.less
+++ b/plugins/libkolab/skins/elastic/include/kolab_files.less
@@ -377,10 +377,11 @@ a.button.saveas:before {
 .document-editor-header {
     .toolbar {
         text-align: left !important;
-    }
+        flex: 1;
 
-    .header-title {
-        margin: 0 !important;
+        a {
+            text-align: center;
+        }
     }
 
     a.button.icon.members:before {