diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index 98c582cce..93437c3a8 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -73,6 +73,21 @@ font.bold {
     }
 }
 
+.image-attachment {
+    /* TODO */
+
+    .image-link {
+    }
+
+    .image-filename {
+    }
+
+    .image-filesize {
+    }
+
+    .attachment-links {
+    }
+}
 
 #folder-selector {
     overflow-y: auto;
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 3c1f5a31d..68c6dfb10 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -172,6 +172,16 @@ html.touch {
     }
 }
 
+@media screen and (max-width: @screen-width-large) {
+    .listing.selection-large-only {
+        li.selected {
+            color: @color-list;
+            background-color: transparent;
+        }
+    }
+}
+
+
 /* icons */
 
 .listing.iconized li {
diff --git a/skins/elastic/templates/includes/settings-menu.html b/skins/elastic/templates/includes/settings-menu.html
index 3ca151c04..ec2d8d89a 100644
--- a/skins/elastic/templates/includes/settings-menu.html
+++ b/skins/elastic/templates/includes/settings-menu.html
@@ -3,10 +3,10 @@
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<span id="aria-label-settingstabs" class="header-title"><roundcube:label name="settings" /></span>
 	</div>
-	<div id="settings-menu" class="scroller">
-		<ul class="listing iconized">
+	<div class="scroller">
+		<ul id="settings-menu" class="listing iconized<roundcube:exp expression="!request:_action ? ' selection-large-only' : ''"/>">
 			<roundcube:object name="settingstabs" class="listitem" tagname="li" />
+			<roundcube:container name="tabs" id="settings-menu" />
 		</ul>
-		<roundcube:container name="tabs" id="settings-menu" />
 	</div>
 </div>