diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index b60de4dc8..e03d19260 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -244,7 +244,11 @@ class PreferenceForm extends Form
                 ],
                 'value' => isset($value) ? $value : '',
                 'disable' => isset($disabled) ? $disabled : [],
-                'escape' => false
+                'escape' => false,
+                'decorators' => array_merge(
+                    array_slice(self::$defaultElementDecorators, 0, -1),
+                    [['HtmlTag', ['tag' => 'div', 'class' => 'control-group theme-mode']]]
+                )
             ]
         );
 
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 39266598b..107b27464 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -88,6 +88,18 @@ form.inline {
   }
 }
 
+#layout.minimal-layout .icinga-form {
+  .form-controls {
+    input[type="submit"] {
+      width: 100%;
+
+      &:not(:last-child) {
+        margin-bottom: 1em;
+      }
+    }
+  }
+}
+
 // Label styles
 
 form.icinga-form .control-label-group {
@@ -546,3 +558,16 @@ form.icinga-form .form-info {
     text-align: center;
   }
 }
+
+#layout.minimal-layout .icinga-form {
+  .theme-mode {
+    .control-label-group {
+      width: 100%;
+      margin-bottom: .5em;
+    }
+
+    label:first-of-type {
+      margin-left: auto;
+    }
+  }
+}
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 933d1aa07..4ecbd6f5f 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -31,18 +31,18 @@ body {
   flex-direction: column;
   position: relative;
   z-index: 2;
+}
 
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    width: 1em;
-    background: linear-gradient(to left, rgba(0,0,0,.1), rgba(0,0,0,0));
-    z-index: 0;
-  }
+#layout:not(.minimal-layout) #sidebar:after {
+  content: "";
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  width: 1em;
+  background: linear-gradient(to left, rgba(0,0,0,.1), rgba(0,0,0,0));
+  z-index: 0;
 }
 
 #main {
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index d425acc13..ddafaa227 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -151,13 +151,19 @@
   > button {
     background: none;
     border: none;
-    height: 2.5em;
+    font-size: 2em;
+    padding: 0 .5em;
+    line-height: 2;
 
     -webkit-appearance: none;
        -moz-appearance: none;
         -ms-appearance: none;
             appearance: none;
   }
+
+  i:before {
+    margin-right: 0;
+  }
 }
 
 .container,
@@ -200,6 +206,9 @@
   list-style-type: none;
   margin: 0;
   padding: 0;
+}
+
+#layout:not(.minimal-layout) #notifications {
   padding-left: 12em;
 }
 
diff --git a/public/css/icinga/responsive.less b/public/css/icinga/responsive.less
index 1597cb1a8..8ebf83882 100644
--- a/public/css/icinga/responsive.less
+++ b/public/css/icinga/responsive.less
@@ -75,16 +75,17 @@
 
   #header-logo-container {
     width: auto;
-    height: 2.5em;
+    height: 4em;
     padding: 0;
     background: inherit;
   }
 
   #header-logo {
     float: left;
-    width: 6em;
-    height: 2em;
-    margin: .25em;
+    width: 9em;
+    height: 3em;
+    margin: .5em 1em;
+    background-position: left center;
   }
 
   #mobile-menu-toggle {