diff --git a/modules/monitoring/application/views/helpers/CommandForm.php b/modules/monitoring/application/views/helpers/CommandForm.php
index 0ddcba521..2f46759a2 100644
--- a/modules/monitoring/application/views/helpers/CommandForm.php
+++ b/modules/monitoring/application/views/helpers/CommandForm.php
@@ -119,7 +119,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
     {
         $form = $this->simpleForm($commandName, $arguments);
 
-        $button = new Zend_Form_Element_Button(
+        $button = new Zend_Form_Element_Submit(
             array(
                 'name'      => 'btn_submit',
                 'class'     => $cls,
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 156cab046..54aa7937a 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -99,17 +99,20 @@ form.inline {
   display: inline;
 }
 
-button.link-like {
+button.link-like, input.link-like {
   color: @colorLinkDefault;
-  background: none;
+  font-weight: normal;
   border: none;
+  background: none;
   padding: 0;
   font-size: 1em;
   cursor: pointer;
 }
 
-button.link-like:hover {
+button.link-like:hover, input.link-like:hover, input.link-like:focus {
   text-decoration: underline;
+  background: none;
+  color: @colorLinkDefault;
 }
 
 form ul.errors {