diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 01bf3f7dd..e0b806069 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -6,16 +6,10 @@ use Icinga\Data\Reducible;
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <div class="grid dont-print">
-    <div class="col-1-3 text-left">
+  <div class="grid">
       <?= $this->limiter ?>
-    </div>
-    <div class="col-1-3">
       <?= $this->paginator ?>
-    </div>
-    <div class="col-1-3 text-right">
       <?= $this->sortBox ?>
-    </div>
   </div>
   <div>
     <?= $this->backendSelection; ?>
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index c89ea82e8..c389c20f7 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -3,18 +3,12 @@ use Icinga\Data\Extensible;
 use Icinga\Data\Reducible;
 
 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
     <?= $this->tabs ?>
-    <div class="grid dont-print">
-        <div class="col-1-3 text-left">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+    <div class="grid">
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
     </div>
     <div>
         <?= $this->backendSelection ?>
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 14ef2ada5..16c4f918d 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -33,10 +33,6 @@
   text-align: center;
 }
 
-.text-left {
-  text-align: left;
-}
-
 .text-right {
   text-align: right;
 }
@@ -176,11 +172,11 @@ table.listing-table {
   border-spacing: @vertical-padding 0;
 
   th {
-    .text-left();
     color: @text-color-light;
     font-size: @font-size-small;
     // Reset default font-weight
     font-weight: normal;
+    text-align: left;
     width: 10em;
   }
 }