diff --git a/application/forms/Control/LimiterControlForm.php b/application/forms/Control/LimiterControlForm.php
index dee834696..88adf4be4 100644
--- a/application/forms/Control/LimiterControlForm.php
+++ b/application/forms/Control/LimiterControlForm.php
@@ -15,7 +15,7 @@ class LimiterControlForm extends Form
      *
      * @var string
      */
-    const CSS_CLASS_LIMITER = 'limiter-control icinga-controls';
+    const CSS_CLASS_LIMITER = 'limiter-control icinga-controls inline';
 
     /**
      * Default limit
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 037e95995..399ff74b2 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -187,7 +187,7 @@ class SortBox extends AbstractWidget
         $columnForm = new Form();
         $columnForm->setTokenDisabled();
         $columnForm->setName($this->name . '-column');
-        $columnForm->setAttrib('class', 'icinga-controls');
+        $columnForm->setAttrib('class', 'icinga-controls inline');
         $columnForm->addElement(
             'select',
             'sort',
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index 762c109aa..362b710fb 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -182,12 +182,6 @@ input.search {
   }
 }
 
-html.no-js .sort-control form {
-  display: table;
-  margin-left: auto;
-  margin-top: 0.25em;
-}
-
 .controls {
   .control-label-group {
     margin-top: 0;
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index e2f346a76..47e5c56c4 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -274,6 +274,8 @@ form.icinga-form .form-controls {
 // Button styles
 
 .icinga-controls {
+  button:not([type]),
+  button[type="submit"],
   input[type="submit"],
   input[type="submit"].btn-confirm {
     .button();
@@ -288,12 +290,17 @@ form.icinga-form .form-controls {
   }
 
   button.noscript-apply {
-    .rounded-corners();
-    .button(@gray-lightest, @gray);
+    color: @gray;
+    background-color: @gray-lightest;
+    border-color: @gray;
     border-width: 1px;
-    display: inline-block;
-    padding: .1em .25em;
-    margin: 0 .5em;
+  }
+}
+
+form.inline {
+  button.noscript-apply {
+    margin-left: .5em;
+    padding: .1em;
   }
 }
 
@@ -479,10 +486,6 @@ form.icinga-form .form-info {
   display: inline-block;
 }
 
-.sort-control > * {
-  display: inline-block;
-}
-
 /* Flyover form styles */
 
 .flyover-content form:not(.inline):not([role="search"]) {