diff --git a/modules/monitoring/public/css/tables.less b/modules/monitoring/public/css/tables.less
index 65247acb2..4c48b9123 100644
--- a/modules/monitoring/public/css/tables.less
+++ b/modules/monitoring/public/css/tables.less
@@ -7,6 +7,22 @@
   font-size: @font-size-small;
 }
 
+// Object link and comment author in the comment overview
+.comment-author {
+  margin-bottom: 0.25em;
+}
+
+// Comment icons, e.g. persistent in the comment overview
+.comment-icons {
+  float: right;
+}
+
+// Comment text in the comment overview
+.comment-text {
+  // Reset margin
+  margin: 0;
+}
+
 // Type information for backends in the monitoring config
 .config-label-meta {
   font-size: @font-size-small;
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 9996e0c80..e724b0ce0 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -88,49 +88,40 @@ a:hover > .icon-cancel {
 .comment-list {
   margin: 0;
 
-  .comment-header {
+  > dt {
     border-bottom: 1px solid @gray-lighter;
+    margin-bottom: 0.25em;
 
     &:hover {
       background-color: @gray-lightest;
 
-      > .comment-meta > .meta-icons > .remove-action {
+      > .remove-action {
         visibility: visible;
       }
     }
 
-    > .comment-meta > .meta-icons > .remove-action {
+    > .remove-action {
       visibility: hidden;
     }
   }
-}
 
-.comment-header {
-  .clearfix();
-}
-
-.comment-meta {
-  color: @text-color-light;
-  font-size: @font-size-small;
-
-  > .meta-icons {
-    float: right;
-    margin-top: 0.2em;
+  > dd {
+    margin: 0 0 1em 0;
   }
 }
 
-.comment-text {
-  // Reset margin
-  margin: 0;
+.comment-time {
+  color: @text-color-light;
+  font-size: @font-size-small;
 }
 
 .name-value-list {
-  dd {
+  > dd {
     // Reset default margin
     margin: 0;
   }
 
-  dt {
+  > dt {
     color: @text-color-light;
     font-size: @font-size-small;
   }
@@ -187,7 +178,11 @@ a:hover > .icon-cancel {
   }
 }
 
-.name-value-table th {
+.name-value-table {
+  width: 100%;
+}
+
+.name-value-table > tbody > tr > th {
   color: @text-color-light;
   // Reset default font-weight
   font-weight: normal;