diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index a65e5c5d5..8f7a63ccc 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -109,9 +109,7 @@ a {
   }
 }
 
-a:focus,
-button:focus,
-input[type="checkbox"]:focus {
+:focus {
   outline: 3px solid fade(@icinga-blue, 50%);
   outline-offset: 1px;
 }
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 10c9fed35..7ada043ff 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -160,7 +160,7 @@ form.icinga-form {
 }
 
 .icinga-controls {
-  input:not([type="checkbox"]):not([type="radio"]),
+  input:not([type="radio"]),
   .toggle-switch,
   button,
   select,
@@ -169,10 +169,6 @@ form.icinga-form {
     .rounded-corners(.25em);
     .appearance(none);
   }
-
-  input[type="radio"] {
-    margin-right: .25em;
-  }
 }
 
 .icinga-controls {
@@ -185,6 +181,10 @@ form.icinga-form {
     font-size: inherit;
     padding: @vertical-padding;
   }
+
+  input[type="radio"] {
+    margin-right: .25em;
+  }
 }
 
 form.icinga-form {
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index 01479b433..b9a9bf2f0 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -161,7 +161,8 @@
 }
 
 .container,
-.error-message {
+.error-message,
+.modal-window {
   // Don't outline containers and error messages when focused because they receive focus for accessibility only
   // programmatically
   outline: none;
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 6a819e73b..1bbabb004 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -103,11 +103,6 @@
     }
   }
 
-  input:focus,
-  input[type="submit"]:focus {
-    outline: 3px solid fade(@icinga-blue, 50%);
-  }
-
   .form-controls {
     margin-bottom: 2em;
     margin-top: 2em;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 5e9031529..8ae3efcae 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -188,8 +188,6 @@ table.multiselect tr[href] td {
 
 #main div.filter {
   form.editor {
-    max-width: 37em;
-
     input[type=text], select {
       width: 12em;
       height: 2em;
@@ -201,17 +199,19 @@ table.multiselect tr[href] td {
     }
 
     button {
+      padding: .5em;
       border: none;
       background: none;
+      color: @text-color;
+
+      &:hover, &:focus {
+        color: @icinga-blue;
+      }
     }
 
     .buttons {
+      margin-left: 25em;
       padding: .25em 0;
-      text-align: right;
-    }
-
-    .buttons input {
-      .button();
     }
 
     .buttons input:not(:last-child) {