diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 47e5c56c4..9849a0b85 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -25,7 +25,7 @@ form.icinga-form {
     margin: 1em -1em 1em 0;
   }
 
-  &:not(.inline) .control-group > * {
+  .control-group > :not(.control-label-group) {
     margin-right: 1em;
   }
 
@@ -115,17 +115,16 @@ form.inline {
 
   .control-group {
     margin: 0;
+
+    &:last-child {
+      margin-right: -1em;
+    }
   }
 
   .control-label-group {
     width: auto;
     line-height: 0.857em;
   }
-
-  .control-group .spinner {
-    line-height: 1.5;
-    margin: 0 auto;
-  }
 }
 
 // General input styles