diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index feb37edc1..6104b3c48 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -9,10 +9,10 @@
 @gray-light: #C9C9C9;
 @gray-lighter: #EEEEEE;
 @gray-lightest: #F7F7F7;
+@disabled-gray: #9a9a9a;
 
-// Icinga colors
-@icinga-blue: #0095BF;
-@icinga-secondary: #EF4F98;
+
+// State colors
 @color-ok: #44bb77;
 @color-up: @color-ok;
 @color-warning: #ffaa44;
@@ -27,6 +27,14 @@
 @color-unreachable-handled: @color-unknown-handled;
 @color-pending: #77aaff;
 
+// Icinga colors
+@icinga-blue: #0095BF;
+@icinga-secondary: #EF4F98;
+@low-sat-blue: #dae3e6;
+@low-sat-blue-dark: #becbcf;
+@icinga-blue-light: #a5c4cd;
+@icinga-blue-dark: #0081a6;
+
 // Notification colors
 @color-notification-error: @color-critical;
 @color-notification-info: @color-pending;
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 262fc85b3..726afb324 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -9,14 +9,6 @@
      this class gets our design applied
  */
 
-// Used colors
-
-@disabled-gray: #9a9a9a;
-@low-sat-blue: #dae3e6;
-@low-sat-blue-dark: #becbcf;
-@icinga-blue-light: #a5c4cd;
-@icinga-blue-dark: #0081a6;
-
 // General form layout
 
 form.icinga-form {