diff --git a/library/Icinga/Web/Form/Decorator/Autosubmit.php b/library/Icinga/Web/Form/Decorator/Autosubmit.php
index 6893c161e..dd06fa7a3 100644
--- a/library/Icinga/Web/Form/Decorator/Autosubmit.php
+++ b/library/Icinga/Web/Form/Decorator/Autosubmit.php
@@ -100,7 +100,7 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
                 : t('Upon its value has changed, this field issues an automatic update of this page.');
             $content .= $this->getView()->icon('cw', $warning, array(
                 'aria-hidden'   => $isForm ? 'false' : 'true',
-                'class'         => 'autosubmit-warning'
+                'class'         => 'spinner'
             ));
             if (! $isForm && $this->getAccessible()) {
                 $content = '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
diff --git a/public/css/icinga/spinner.less b/public/css/icinga/spinner.less
index b1c803cf0..95c017596 100644
--- a/public/css/icinga/spinner.less
+++ b/public/css/icinga/spinner.less
@@ -1,11 +1,13 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 a.spinner.active > i,
-button.spinner.active > i  {
+button.spinner.active > i,
+i.spinner.active {
   .animate(spin 2s infinite linear);
   &:before {
     // icon-spin6
     content: '\e874';
+    margin: 0; // Disables wobbling
   }
 }
 
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index d92b10a37..51e912f12 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -334,8 +334,8 @@
             $form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
 
             // Show a spinner depending on how the form is being submitted
-            if (autosubmit && typeof $el !== 'undefined' && $el.next().hasClass('autosubmit-warning')) {
-                $el.next().addClass('spinning');
+            if (autosubmit && typeof $el !== 'undefined' && $el.next().hasClass('spinner')) {
+                $el.next().addClass('active');
             } else if ($button.length && $button.is('button') && $button.hasClass('animated')) {
                 $button.addClass('active');
             } else if ($button.length && $button.attr('data-progress-label')) {
@@ -376,7 +376,7 @@
                     if ($progressElement.hasClass('spinner')) {
                         $('i', $progressElement).addClass('active');
                     } else {
-                        $('i.autosubmit-warning', $progressElement).addClass('spinning');
+                        $('i.spinner', $progressElement).addClass('active');
                     }
                 }
             }