diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index 5b1894cdb..d087b532e 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -232,3 +232,12 @@ td, th {
     top: 2.5em;
   }
 }
+
+@media (min-height: @prefer-light-color-scheme), (prefers-color-scheme: light) and (min-height: @enable-color-preference) {
+  .container {
+    &:before,
+    > .content:before {
+      background-image: url(../img/icinga-loader-light.gif)
+    }
+  }
+}
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index 3f1ea7e18..549d31c76 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -43,6 +43,14 @@ input.search {
   }
 }
 
+@media (min-height: @prefer-light-color-scheme), (prefers-color-scheme: light) and (min-height: @enable-color-preference) {
+  #menu input.search,
+  .controls input.search,
+  input.search {
+    background-image: url(../img/icons/search.png);
+  }
+}
+
 .backend-selection,
 .pagination-control,
 .selection-info,
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index e79566119..661164796 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -356,3 +356,11 @@
     }
   }
 }
+
+@media (min-height: @prefer-light-color-scheme), (prefers-color-scheme: light) and (min-height: @enable-color-preference) {
+  #header-logo,
+  #mobile-menu-logo,
+  #about .icinga-logo {
+    filter: brightness(0.415) sepia(1) ~"saturate(0.1)" hue-rotate(144deg);
+  }
+}
diff --git a/public/css/themes/icinga-light-theme.less b/public/css/themes/icinga-light-theme.less
index fdca95f7f..505d3880a 100644
--- a/public/css/themes/icinga-light-theme.less
+++ b/public/css/themes/icinga-light-theme.less
@@ -1,7 +1,4 @@
 
-@original-menu-bg-color: #06062B;
-@original-low-sat-blue: #404d72;
-
 @gray: #7F7F7F;
 @gray-semilight: #A9A9A9;
 @gray-light: #C9C9C9;
@@ -20,31 +17,3 @@
 
 @low-sat-blue: #DEECF1;
 @low-sat-blue-dark: #c0cccd;
-
-#header-logo,
-#mobile-menu-logo,
-#about .icinga-logo {
-  filter: brightness(0.415) sepia(1) ~"saturate(0.1)" hue-rotate(144deg);
-}
-
-#menu input.search,
-.controls input.search,
-input.search {
-  background-image: url(../img/icons/search.png);
-}
-
-#login {
-  background-color: @original-menu-bg-color;
-
-  input[type=password],
-  input[type=text] {
-    background-color: @original-low-sat-blue;
-  }
-}
-
-.container {
-  &:before,
-  > .content:before {
-    background-image: url(../img/icinga-loader-light.gif)
-  }
-}