diff --git a/modules/monitoring/application/views/scripts/partials/event-history.phtml b/modules/monitoring/application/views/scripts/partials/event-history.phtml
index 73648095b..3318deae3 100644
--- a/modules/monitoring/application/views/scripts/partials/event-history.phtml
+++ b/modules/monitoring/application/views/scripts/partials/event-history.phtml
@@ -179,38 +179,47 @@ $rowAction = Url::fromPath('monitoring/event/show');
                 <div class="state-meta"><?= $this->formatTime($event->timestamp) ?></div>
             </td>
             <td>
-                <?php if ($this->isOverview): ?>
-                    <?= $this->qlink(
-                        $event->host_display_name,
-                        'monitoring/host/show',
-                        array(
-                            'host' => $event->host_name,
-                        ),
-                        array('title' => sprintf(
-                            $this->translate('Show detailed information for host %s'),
-                            $event->host_display_name
-                        ))
-                    ) ?><?php if ($isService): ?>&#58;
+                <div class="history-message-container">
+                <?php if ($icon): ?>
+                    <div class="history-message-icon">
+                        <?= $this->icon($icon, $iconTitle) ?>
+                    </div>
+                <?php endif ?>
+                    <div class="history-message-output">
+                    <?php if ($this->isOverview): ?>
                         <?= $this->qlink(
-                            $event->service_display_name,
-                            'monitoring/service/show',
-                            array(
-                                'host'      => $event->host_name,
-                                'service'   => $event->service_description
-                            ),
-                            array(
+                            $event->host_display_name,
+                            'monitoring/host/show',
+                            [
+                                'host' => $event->host_name,
+                            ],
+                            [
                                 'title' => sprintf(
-                                    $this->translate('Show detailed information for service %s on host %s'),
-                                    $event->service_display_name,
+                                    $this->translate('Show detailed information for host %s'),
                                     $event->host_display_name
                                 )
-                            )
-                        ) ?>
+                            ]
+                        ) ?><?php if ($isService): ?>&#58;
+                            <?= $this->qlink(
+                                $event->service_display_name,
+                                'monitoring/service/show',
+                                [
+                                    'host'    => $event->host_name,
+                                    'service' => $event->service_description
+                                ],
+                                [
+                                    'title' => sprintf(
+                                        $this->translate('Show detailed information for service %s on host %s'),
+                                        $event->service_display_name,
+                                        $event->host_display_name
+                                    )
+                                ]
+                            ) ?>
+                        <?php endif ?>
                     <?php endif ?>
-                <?php endif ?>
-                <?php if ($icon) {
-                    echo $this->icon($icon, $iconTitle);
-                } ?><?= $this->nl2br($this->createTicketLinks($this->markdown($msg, ['class' => 'overview-plugin-output']))) ?>
+                        <?= $this->nl2br($this->createTicketLinks($this->markdown($msg, ['class' => 'overview-plugin-output']))) ?>
+                    </div>
+                </div>
             </td>
         </tr>
         <?php endforeach ?>
diff --git a/modules/monitoring/public/css/tables.less b/modules/monitoring/public/css/tables.less
index 04d5a71ee..33472373a 100644
--- a/modules/monitoring/public/css/tables.less
+++ b/modules/monitoring/public/css/tables.less
@@ -241,3 +241,18 @@
     cursor: pointer;
   }
 }
+
+// Event history
+.history-message-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  > .history-message-icon {
+    padding: 0.25em;
+  }
+
+  > .history-message-output {
+    flex: 1;
+  }
+}