diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index ddcff7d26..e006491af 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -590,6 +590,7 @@ form.instance-features span.description, form.object-features span.description {
 .object-features {
   .control-label-group {
     text-align: left;
+    margin-right: 0;
     width: @name-value-table-name-width;
 
     label {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 3f47ae600..a4965e30f 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -52,7 +52,6 @@ form.icinga-form {
 
     .control-label-group {
       text-align: left;
-      width: 100%;
       padding-bottom: 0;
       padding-left: 0;
       margin-bottom: 0;
@@ -82,7 +81,7 @@ form.icinga-form .control-label-group {
   padding: .5625em .5625em .5625em 0;
   max-height: 2.5em;
   text-align: right;
-  width: @name-value-table-name-width;
+  width: 14em;
 }
 
 .icinga-controls .control-info {