diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index e9a885dbe..e1092b033 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -55,8 +55,8 @@ class Monitoring_CommentsController extends Controller
                 'title' => $this->translate(
                     'Display detailed information about multiple comments.'
                 ),
-                'icon' => 'comment',
-                'label' => $this->translate('Comments'),
+                'icon'  => 'comment',
+                'label' => $this->translate('Comments') . sprintf(' (%d)', count($this->comments)),
                 'url'   =>'monitoring/comments/show'
             )
         )->activate('comments');
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 49424ed3a..4ba872bbd 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -75,8 +75,8 @@ class Monitoring_DowntimesController extends Controller
                 'title' => $this->translate(
                     'Display detailed information about multiple downtimes.'
                 ),
-                'icon' => 'plug',
-                'label' => $this->translate('Downtimes'),
+                'icon'  => 'plug',
+                'label' => $this->translate('Downtimes') . sprintf(' (%d)', count($this->downtimes)),
                 'url'   =>'monitoring/downtimes/show'
             )
         )->activate('downtimes');
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 5a734cbbe..45eca1135 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -41,7 +41,7 @@ class Monitoring_HostsController extends Controller
                     $this->translate('Show summarized information for %u hosts'),
                     count($this->hostList)
                 ),
-                'label' => sprintf($this->translate('Hosts (%d)'), count($this->hostList)),
+                'label' => $this->translate('Hosts') . sprintf(' (%d)', count($this->hostList)),
                 'url'   => Url::fromRequest(),
                 'icon'  => 'host'
             )
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 83b1b5dd5..f4ee73cf5 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -40,7 +40,7 @@ class Monitoring_ServicesController extends Controller
                     $this->translate('Show summarized information for %u services'),
                     count($this->serviceList)
                 ),
-                'label' => sprintf($this->translate('Services (%d)'), count($this->serviceList)),
+                'label' => $this->translate('Services') . sprintf(' (%d)', count($this->serviceList)),
                 'url'   => Url::fromRequest(),
                 'icon'  => 'services'
             )
diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
index f84f512b1..4f9c64d47 100644
--- a/modules/monitoring/application/views/scripts/comments/show.phtml
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -8,15 +8,8 @@
   </div>
 </div>
 
-<div class="content">
+<div class="content multi-commands">
   <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
-  <p>
-    <?= sprintf(
-            $this->translate('Issue commands to all %s selected comments.'),
-            '<b>' . count($comments) . '</b>'
-        )
-    ?>
-    <div>
     <?= $this->qlink(
         sprintf(
             $this->translate('Remove %d comments'),
@@ -29,6 +22,4 @@
             'title' => $this->translate('Remove all selected comments.')
         )
     ) ?>
-    </div>
-  </p>
 </div>
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 35edc04f4..1c508bbc9 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -7,15 +7,8 @@
   <?= $this->render('partials/downtime/downtimes-header.phtml'); ?> 
 </p>
 </div>
-<div class="content">
-  <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
-  <p>
-    <?= sprintf(
-            $this->translate('Issue commands to all %s selected downtimes.'),
-            '<b>' . count($downtimes) . '</b>'
-        )
-    ?>
-    <div>
+<div class="content multi-commands">
+    <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
     <?= $this->qlink(
         sprintf(
             $this->translate('Remove all %d scheduled downtimes'),
@@ -28,6 +21,4 @@
             'title' => $this->translate('Remove all selected downtimes.')
         )
     ) ?>
-    </div>
-  </p>
 </div>
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 6b4ed4ca3..6bbb3c80d 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -8,7 +8,7 @@
 
 </div>
 
-<div class="content no-padding-top">
+<div class="content multi-commands">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
@@ -165,7 +165,7 @@
                     $acknowledgedCount
                 ),
                 '<b>' . $acknowledgedCount . '</b>'
-            ); ?></p>
+            ); ?>
 
             <?= $removeAckForm ?>
         </div>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
index 4ec725549..7e2a5d87c 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
@@ -18,13 +18,15 @@
 </table>
 
 <p>
+    <?php if ($i > 5): ?>
     <?= $this->qlink(
-        sprintf($this->translate('List all %d comments …'), count($comments)),
+        sprintf($this->translate('show all %d comments'), $i),
         $listAllLink,
         null,
         array(
-            'title' => $this->translate('List all'),
+            'icon' => $i > 5 ? 'down-open' : '',
             'data-base-target' => "_next"
         )
     ) ?>
+    <?php endif ?>
 </p>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 54cd0210c..5518e5022 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -79,14 +79,16 @@
     </tbody>
   </table>
 
-  <p> 
+  <p>
+    <?php if ($i > 5): ?>
     <?= $this->qlink(
-        sprintf($this->translate('List all %d downtimes …'), count($downtimes)),
+        sprintf($this->translate('show all %d downtimes'), $i),
         $listAllLink,
         null,
         array(
-            'title' => $this->translate('List all'),
+            'icon' => $i > 5 ? 'down-open' : '',
             'data-base-target' => "_next"
         )
     ) ?>
+    <?php endif ?>
   </p>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 17cf9f7fe..d59479e07 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -25,15 +25,20 @@ $i = 0;
         <?php endforeach ?>
     </tbody>
     </table>
-    <div class="hbox-item">
+    <div class="hbox-item multi-commands">
+        <?php if ($i > 5): ?>
         <?=
         $this->qlink(
-            sprintf($this->translate('list all %d hosts ...'), $i),
+            sprintf($this->translate('show all %d hosts'), $i),
             $listAllLink,
             null,
-            array('data-base-target' => '_next')
+            array(
+                'icon' => 'down-open',
+                'data-base-target' => '_next'
+            )
         );
         ?>
+        <?php endif ?>
     </div>
 <?php endif ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index c51861f03..0d3d4840d 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -27,14 +27,18 @@ $i = 0;
     <?php endforeach ?>
     </tbody>
     </table>
-    <div class="hbox-item">
-        <?php
-        echo $this->qlink(
-            sprintf($this->translate('List all %d services ...'), $i),
+    <div class="hbox-item multi-commands">
+        <?php if ($i > 5): ?>
+        <?= $this->qlink(
+            sprintf($this->translate('show all %d services'), $i),
             $listAllLink,
             null,
-            array('data-base-target' => '_next')
+            array(
+                'icon' => 'down-open',
+                'data-base-target' => '_next'
+            )
         );
         ?>
+        <?php endif ?>
     </div>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 429f43ea6..746e24871 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -8,7 +8,7 @@
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
-<div class="content no-padding-top">
+<div class="content multi-commands">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 63be9f546..3a8713a38 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -373,6 +373,7 @@ html {
   width: 1px;
 }
 
-.no-padding-top {
+.multi-commands {
   padding-top: 0em;
+  font-size: 0.9em;
 }
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 4902bebb1..ba0877232 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -933,11 +933,6 @@ table.statesummary {
   width: auto;
   border-collapse: separate;
 
-  td {
-    padding: 0em 0.4em 0em 0.4em;
-    line-height: 1.2em;
-  }
-
   tr.state td.state {
     width: auto;
     font-weight: bold;