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;
 }