diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index 3bcd67065..52f7d9242 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -330,7 +330,8 @@
       padding-left: .75em;
     }
 
-    .nav-level-1 > .nav-item i {
+    .nav-level-1 > .nav-item > a > i,
+    .nav-level-1 > .nav-item > span > i {
       font-size: 1.5em;
       margin-right: .5em;
     }
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 5503bab69..f127e83a0 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -35,11 +35,11 @@
   }
 }
 
-#layout:not(.sidebar-collapsed) #menu .nav-item > a:first-of-type {
+#layout:not(.sidebar-collapsed) #menu .nav-item > a:first-of-type,
+#layout:not(.minimal-layout).sidebar-collapsed #menu .nav-level-2 > .nav-item > a:first-of-type,
+#layout.minimal-layout #menu .nav-level-1 > .nav-item > a:first-of-type {
   // Respect overflowing content
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  .text-ellipsis();
 }
 
 #layout:not(.minimal-layout).sidebar-collapsed #menu .nav-level-1 > .nav-item {
@@ -537,9 +537,10 @@ html.no-js  #toggle-sidebar {
 
   span {
     padding-left: 1.375em;
+    padding-right: 0.545em;
     height: @nav-item-height;
-    display: flex;
-    align-items: center;
+    line-height: @nav-item-height;
+    display: block;
 
     font-weight: @font-weight-bold;
     .text-ellipsis();