diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 1969c27e6..3fdefcbe8 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -3,11 +3,9 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Web\Url;
 
 if (! $this->compact): ?>
-<div class="controls separated">
+<div class="controls">
     <?= $this->tabs ?>
-    <div class="grid">
-        <?= $this->sortBox ?>
-    </div>
+    <?= $this->sortBox ?>
     <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
diff --git a/modules/monitoring/public/css/service-grid.less b/modules/monitoring/public/css/service-grid.less
index 54565ab8d..6fee13252 100644
--- a/modules/monitoring/public/css/service-grid.less
+++ b/modules/monitoring/public/css/service-grid.less
@@ -1,6 +1,6 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-table.service-grid-table {
+.service-grid-table {
   width: 0;
   white-space: nowrap;
 
@@ -25,7 +25,7 @@ table.service-grid-table {
     }
   }
 
-  th.rotate-45 {
+  .rotate-45 {
     height: 6em;
 
     div {
@@ -34,10 +34,14 @@ table.service-grid-table {
     }
   }
 
-  td.service-grid-table-more {
+  .service-grid-table-more {
     text-align: center;
     a {
       display: inline;
     }
   }
 }
+
+.joystick-pagination a {
+  color: @text-color;
+}