diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index f6e3301ee..56be44ffd 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -16,7 +16,7 @@ if (! $this->compact): ?>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next"
-         class="table-row-selectable multiselect"
+         class="table-row-selectable state-table multiselect"
          data-icinga-multiselect-url="<?= $this->href('monitoring/downtimes/show'); ?>"
          data-icinga-multiselect-controllers="<?= $this->href("monitoring/downtimes") ?>"
          data-icinga-multiselect-data="downtime_id">
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index d93af83eb..53b543625 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -22,7 +22,7 @@ if (! $this->compact): ?>
     </div>
 <?php return; endif ?>
     <table data-base-target="_next"
-           class="table-row-selectable multiselect"
+           class="table-row-selectable state-table multiselect"
            data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
            data-icinga-multiselect-controllers="<?= $this->href("monitoring/hosts") ?>"
            data-icinga-multiselect-data="host">
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 48e130aee..a70eb6932 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -18,7 +18,7 @@ if (! $this->compact): ?>
     <p><?= $this->translate('No notifications found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
-    <table data-base-target="_next" class="table-row-selectable">
+    <table data-base-target="_next" class="table-row-selectable state-table">
     <tbody>
     <?php foreach ($notifications->peekAhead($this->compact) as $notification):
         if (isset($notification->service_description)) {
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 848a91196..6d89ceda2 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -23,7 +23,7 @@ if (! $this->compact): ?>
 </div>
 <?php return; endif ?>
     <table data-base-target="_next"
-           class="table-row-selectable multiselect<?php if ($this->compact): ?> compact<?php endif ?>"
+           class="table-row-selectable state-table multiselect<?php if ($this->compact): ?> compact<?php endif ?>"
            data-icinga-multiselect-url="<?= $this->href('monitoring/services/show') ?>"
            data-icinga-multiselect-controllers="<?= $this->href('monitoring/services') ?>"
            data-icinga-multiselect-data="service,host">
diff --git a/modules/monitoring/application/views/scripts/partials/event-history.phtml b/modules/monitoring/application/views/scripts/partials/event-history.phtml
index d8f0b720c..e7ae0e034 100644
--- a/modules/monitoring/application/views/scripts/partials/event-history.phtml
+++ b/modules/monitoring/application/views/scripts/partials/event-history.phtml
@@ -31,7 +31,7 @@ $history->limit($limit * $page);
     <p><?= $this->translate('No historical events found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
-    <table data-base-target="_next"<?php if (isset($tableCssClass)): ?> class="<?=$tableCssClass ?>"<?php endif ?>>
+    <table class="state-table" data-base-target="_next"<?php if (isset($tableCssClass)): ?> class="<?=$tableCssClass ?>"<?php endif ?>>
     <tbody>
     <?php foreach ($history->peekAhead() as $event):
         $icon = '';
diff --git a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
index c24ddae49..517b590a6 100644
--- a/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/host-header.phtml
@@ -2,7 +2,7 @@
 use Icinga\Module\Monitoring\Object\Host;
 /** @var Host $object */
 ?>
-<table>
+<table class="state-table">
     <tr>
         <td class="state-col state-<?= Host::getStateText($object->host_state) ?><?= $object->host_handled ? ' handled' : '' ?>">
             <div class="state-header"><?= Host::getStateText($object->host_state, true) ?></div>
diff --git a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
index 37f56dc64..7bd99b469 100644
--- a/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/object/service-header.phtml
@@ -3,7 +3,7 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 ?>
-<table>
+<table class="state-table">
     <tr>
         <td class="state-col state-<?= Host::getStateText($object->host_state) ?><?= $object->host_handled ? ' handled' : '' ?>">
             <div class="state-label"><?= Host::getStateText($object->host_state, true) ?></div>
diff --git a/modules/monitoring/application/views/scripts/show/components/checksource.phtml b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
index 011288542..5e65e9d33 100644
--- a/modules/monitoring/application/views/scripts/show/components/checksource.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
@@ -4,19 +4,17 @@
         <?= $this->translate('Check Source') ?>
     </th>
     <td>
-        <p>
-            <?php if ($object->is_reachable !== null) {
-                if ((bool) $object->is_reachable) {
-                    echo $this->icon('circle', $this->translate('Is reachable'), array('class' => 'fg-color-ok'));
-                } else {
-                    echo $this->icon('circle', $this->translate('Not reachable'), array('class' => 'fg-color-critical'));
-                }
-            } ?>
-            <?= $this->escape($object->check_source) ?>
-        <?php if ($object->is_reachable !== null): ?>
-            <span class="check-source-meta"><?= (bool) $object->is_reachable ? $this->translate('is reachable') : $this->translate('is not reachable') ?></span>
-        <?php endif ?>
-        </p>
+        <?php if ($object->is_reachable !== null) {
+            if ((bool) $object->is_reachable) {
+                echo $this->icon('circle', $this->translate('Is reachable'), array('class' => 'fg-color-ok'));
+            } else {
+                echo $this->icon('circle', $this->translate('Not reachable'), array('class' => 'fg-color-critical'));
+            }
+        } ?>
+        <?= $this->escape($object->check_source) ?>
+    <?php if ($object->is_reachable !== null): ?>
+        <span class="check-source-meta"><?= (bool) $object->is_reachable ? $this->translate('is reachable') : $this->translate('is not reachable') ?></span>
+    <?php endif ?>
     </td>
 </tr>
 <?php endif ?>