diff --git a/modules/monitoring/application/views/helpers/CommandForm.php b/modules/monitoring/application/views/helpers/CommandForm.php
index e8b17aef7..d3124019d 100644
--- a/modules/monitoring/application/views/helpers/CommandForm.php
+++ b/modules/monitoring/application/views/helpers/CommandForm.php
@@ -55,6 +55,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
     public function simpleForm($commandName, array $arguments = array())
     {
         $form = new Form();
+        $form->setAttrib('class', 'inline');
         $form->setIgnoreChangeDiscarding(true);
         $form->setRequest(Zend_Controller_Front::getInstance()->getRequest());
 
@@ -115,14 +116,14 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
      *
      * @return Form
      */
-    public function labelSubmitForm($submitLabel, $submitTitle, $cls, $commandName, array $arguments = array())
+    public function labelSubmitForm($submitLabel, $submitTitle, $cls = '', $commandName, array $arguments = array())
     {
         $form = $this->simpleForm($commandName, $arguments);
 
         $button = new Zend_Form_Element_Button(
             array(
                 'name'      => 'btn_submit',
-                'class'     => $this->mergeClass('button btn-common', $cls),
+                'class'     => $cls,
                 'escape'    => false,
                 'value'     => '1',
                 'type'      => 'submit',
@@ -189,7 +190,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
         }
 
         if ($changed === true) {
-            $out .= $this->view->icon('config_changed.png') . ' (modified)';
+            $out .= ' (modified)';
         }
 
         $formCode = (string) $form;
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 0a26a0d13..fb7da0f49 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -77,6 +77,24 @@ select::-moz-focus-inner {
   outline: 0;
 }
 
+form.inline {
+  margin: 0;
+  padding: 0;
+  display: inline;
+}
+
+button.link-like {
+  color: @colorLinkDefault;
+  background: none;
+  border: none;
+  padding: 0;
+  font-size: 1em;
+  cursor: pointer;
+}
+
+button.link-like:hover {
+  text-decoration: underline;
+}
 
 input[type=submit]:hover, a.button:hover {
   cursor: pointer;