diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 98b7670a92..5999231dc9 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -39,7 +39,8 @@ class StyleSheet
         'css/icinga/controls.less',
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
-        'css/icinga/about.less'
+        'css/icinga/about.less',
+        'css/icinga/spinner.less'
     );
 
     public static function compileForPdf()
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 3fb82faf1d..e021d54f62 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -29,19 +29,27 @@ input[type="submit"] {
 
 // TODO(el): .form-inline control-group { display: inline-block; }
 form.inline {
+  .control-group {
+    padding: 0;
+  }
+  .form-controls {
+    margin: 0;
+  }
   display: inline-block;
 }
 
-
 .form-controls {
   margin-left: 160px;
 }
 
-button,
 input[type="submit"] {
   .button();
 }
 
+button:hover .icon-cancel {
+  color: @color-critical;
+}
+
 .control-label {
   display: inline-block;
   font-size: @font-size-small;
@@ -59,8 +67,8 @@ input[type="submit"] {
   padding: @vertical-padding @horizontal-padding;
 }
 
-button.link,
-input[type="submit"].link {
+.link-button {
+  .action-link();
   // Reset defaults
   background: none;
   border: none;
@@ -73,31 +81,6 @@ input[type="submit"].link {
   }
 }
 
-form.link {
-  display: inline-block;
-}
-
-.spinner {
-  display: inline-block;
-  vertical-align: middle;
-
-  i {
-    .invisible();
-
-    &.active {
-      .visible();
-
-      &:before {
-        .animate(spin 2s infinite linear);
-      }
-    }
-
-    &:before {
-      margin: 0; // Disables wobbling
-    }
-  }
-}
-
 //div.config-form-buttons {
 //  margin-top: 5px;
 //}
diff --git a/public/css/icinga/spinner.less b/public/css/icinga/spinner.less
new file mode 100644
index 0000000000..b1c803cf0a
--- /dev/null
+++ b/public/css/icinga/spinner.less
@@ -0,0 +1,31 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+a.spinner.active > i,
+button.spinner.active > i  {
+  .animate(spin 2s infinite linear);
+  &:before {
+    // icon-spin6
+    content: '\e874';
+  }
+}
+
+div.spinner {
+  display: inline-block;
+  vertical-align: middle;
+
+  i {
+    .invisible();
+
+    &.active {
+      .visible();
+
+      &:before {
+        .animate(spin 2s infinite linear);
+      }
+    }
+
+    &:before {
+      margin: 0; // Disables wobbling
+    }
+  }
+}
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 2c02bfb945..8c940e9bce 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -138,18 +138,6 @@ a.close-tab {
   display: none;
 }
 
-.spinner > i {
-  line-height: 1;
-}
-
-.spinner.active > i  {
-  .animate(spin 2s infinite linear);
-  &:before {
-    // icon-spin6
-    content: '\e874';
-  }
-}
-
 span.display-on-hover {
   font-size: 0.8em;
   left: -9000px;