diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
index 3ae3128e..9b18c61b 100644
--- a/plugins/kolab_files/skins/elastic/templates/files.html
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -36,7 +36,7 @@
 		<div id="filestoolbar" class="toolbar menu">
 			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('files')"
-				label="options" class="settings" innerClass="inner" />
+				label="options" class="options" innerClass="inner" />
 			<roundcube:button id="sessionslistmenu-link" name="sessionslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('sessions')"
 				label="options" class="hidden settings" innerClass="inner" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 0ec63fdc..9fe88e07 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -26,7 +26,7 @@
 		<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 menu" role="toolbar">
-			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button options 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>
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
index 800510cb..ef944b5c 100644
--- a/plugins/tasklist/skins/elastic/templates/mainview.html
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -27,7 +27,7 @@
 		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
 		<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"
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button options 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>