diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 419151748a..c9a786279d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -365,14 +365,9 @@ form.instance-features span.description, form.object-features span.description {
   text-align: left;
 }
 
-form.object-features .control-label-group {
+.object-features .control-label-group {
   text-align: left;
-  width: 150px;
-}
-
-form.object-features .control-label {
-  margin-left: 7px;
-  line-height: 25px;
+  width: @name-value-table-name-width;
 }
 
 .custom-variables ul {
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 5d8685ffd1..0f5226a75c 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -1,5 +1,8 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+// Width for the name column--th--of name-value-table
+@name-value-table-name-width = 14em;
+
 .action-link {
   color: @icinga-blue;
 }
@@ -183,7 +186,7 @@ a:hover > .icon-cancel {
   padding-left: 0;
   text-align: left;
   vertical-align: top;
-  width: 14em;
+  width: @name-value-table-name-width;
 }
 
 // TODO(el): Fix