diff --git a/public/css/module.less b/public/css/module.less
index f048863f..4c2b598c 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -10,18 +10,19 @@ a:focus {
     float: left;
     display: flex;
     align-items: center;
-    font-size: 1.3em;
     color: @icinga-blue;
+    flex-wrap: wrap;
+    white-space: nowrap;
+
+    & > * {
+        margin: 0 1em 0.5em 0.25em;
+    }
 
     > a {
         &:hover::before {
             text-decoration: none;
         }
 
-        &:not(:last-child) {
-            margin-right: 1em;
-        }
-
         &.button-link {
             color: @text-color-on-icinga-blue;
             background: @icinga-blue;
@@ -29,16 +30,10 @@ a:focus {
             &:active, &:focus {
                 text-decoration: none;
             }
-
-            &:last-child {
-                margin-left: auto;
-            }
         }
     }
 
     > div.view-toggle {
-        margin-right: 1em;
-
         span {
             color: @gray;
             margin-right: .5em;
@@ -78,7 +73,7 @@ a:focus {
 }
 
 .controls {
-    &.sort-control,
+    .sort-control,
     &.want-fullscreen > a {
         float: right;
     }