diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index 4d26d2f53..3d601002d 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -141,15 +141,18 @@ html.no-js .controls > .tabs {
 
 .dashboard {
   letter-spacing: -0.417em;
-  margin: 0 -0.5 * @gutter;
 
   > .container {
     display: inline-block;
     letter-spacing: normal;
-    padding: 0 0.5 * @gutter;
     vertical-align: top;
     // Column width controlled by #layout
     width: 100%;
+
+    &:last-of-type {
+      // See reponsive.less for gutters
+      padding-right: 0;
+    }
   }
 }
 
diff --git a/public/css/icinga/responsive.less b/public/css/icinga/responsive.less
index c3ac067d2..2fa6f6c2a 100644
--- a/public/css/icinga/responsive.less
+++ b/public/css/icinga/responsive.less
@@ -81,14 +81,17 @@
 // Dashboard
 
 #layout.default-layout .dashboard > .container {
+  padding-right: @gutter;
   width: 50%;
 }
 
 #layout.wide-layout .dashboard > .container {
+  padding-right: @gutter;
   width: 33.33%;
 }
 
 #layout.twocols .dashboard > .container {
+  padding-right: 0;
   width: 100%;
 }