diff --git a/public/css/common.less b/public/css/common.less
index 73d51663..20f66352 100644
--- a/public/css/common.less
+++ b/public/css/common.less
@@ -306,13 +306,3 @@ form[name="form_confirm_removal"] {
   padding: 0 0.25em;
   .rounded-corners();
 }
-
-.item-list {
-  .title .affected-objects {
-    margin-left: .28125em; // calculated   width;
-  }
-
-  .default-item-layout .title .affected-objects {
-    margin-left: 0;
-  }
-}
diff --git a/public/css/item/icon-image.less b/public/css/item/icon-image.less
new file mode 100644
index 00000000..e0b03618
--- /dev/null
+++ b/public/css/item/icon-image.less
@@ -0,0 +1,37 @@
+.item-layout {
+  .icon-image {
+    width: 3em;
+    height: 3em;
+    text-align: center;
+    margin-top: .5em;
+    margin-right: .5em;
+    overflow: hidden;
+
+    img {
+      max-height: 100%;
+      max-width: 100%;
+      height: auto;
+      width: auto;
+    }
+
+    .icon, img {
+      vertical-align: baseline;
+    }
+  }
+
+  &.minimal-item-layout {
+    .icon-image {
+      height: 2em;
+      width: 2em;
+      line-height: 2;
+    }
+  }
+
+  &.header-item-layout .icon-image {
+    margin-top: 0;
+
+    img {
+      vertical-align: middle;
+    }
+  }
+}
diff --git a/public/css/list/item-list.less b/public/css/list/item-list.less
index 61fa9bb8..788b973b 100644
--- a/public/css/list/item-list.less
+++ b/public/css/list/item-list.less
@@ -54,31 +54,27 @@
 }
 
 .item-list {
-  .icon-image {
-    width:  3em;
-    height: 3em;
-    text-align: center;
-    margin-top: .5em;
-    margin-left: .5em;
-    overflow: hidden;
-
-    img {
-      max-height: 100%;
-      max-width: 100%;
-      height: auto;
-      width: auto;
+  .detailed-item-layout footer {
+    .status-icons .icon, .performance-data {
+      font-size: .857em;
+      line-height: 1.5*.857em;
     }
   }
 
-  &.minimal-item-layout {
-    .icon-image {
-      height: 2em;
-      width: 2em;
-      line-height: 2;
+  // Not sure what this is for. Maybe user content? (Markdown) But why in the title??
+  .default-item-layout .title {
+    p {
+      margin: 0;
+    }
+  }
+
+  .minimal-item-layout .title {
+    p {
+      display: inline;
+
+      & + p {
+        margin-left: .417em;
+      }
     }
   }
 }
-
-.controls .minimal-item-layout .icon-image {
-  margin-top: 0;
-}
diff --git a/public/css/widget/object-grid.less b/public/css/widget/object-grid.less
index 8f5a6c9f..8bad0663 100644
--- a/public/css/widget/object-grid.less
+++ b/public/css/widget/object-grid.less
@@ -4,23 +4,20 @@ ul.object-grid {
   display: grid;
   grid-template-columns: repeat(auto-fit, 15em);
   grid-gap: 1em 2em;
+  margin: 0;
+  padding: 0;
 
   li.item-layout.object-grid-cell {
-    margin: -.25em;
     padding: .25em;
-    border-radius: .5em;
-
-    .visual {
-      padding: 0;
-    }
+    .rounded-corners();
 
     .caption {
-      height: auto;
+      height: 1.5em; // Single line
+      .text-ellipsis();
+      .line-clamp("reset");
     }
 
     .title, .caption {
-      line-height: 1;
-
       a {
         display: inline-block;
         max-width: 10em;