diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 51c9b79ed4..5d8fcb60b6 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -101,6 +101,6 @@ public function deleteAllAction()
         ));
         $delDowntimeForm->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'));
         $delDowntimeForm->setDowntimes($this->downtimes->fetchAll())->handleRequest();
-        $this->view->delDowntimeForm = $delDowntimeForm;
+        $this->view->delAllDowntimeForm = $delDowntimeForm;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 27fbae67a1..fd14172241 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -68,7 +68,7 @@ public function addSubmitButton()
                 'ignore'        => true,
                 'escape'        => false,
                 'type'          => 'submit',
-                'class'         => 'link-like spinner',
+                'class'         => 'action-link link',
                 'label'         => $this->getView()->icon('trash'),
                 'title'         => $this->translate('Delete this downtime'),
                 'decorators'    => array('ViewHelper')
diff --git a/modules/monitoring/application/views/scripts/downtime/remove.phtml b/modules/monitoring/application/views/scripts/downtime/remove.phtml
index 57fe366556..34a7dbdc8e 100644
--- a/modules/monitoring/application/views/scripts/downtime/remove.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/remove.phtml
@@ -4,7 +4,9 @@
     <?= $this->tabs; ?>
   <?php endif ?>
 
-  <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
+  <table>
+    <tr> <?= $this->render('partials/downtime/downtime-header.phtml') ?> </tr>
+  </table>
 </div>
 <div class="content object-command">
     <?= $delDowntimeForm; ?>
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index 4a3583363c..b59001a2fb 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -3,119 +3,171 @@
         <?= $this->tabs; ?>
     <?php endif ?>
 
-    <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
+    <table>
+      <tr> <?= $this->render('partials/downtime/downtime-header.phtml'); ?> </tr>
+    </table>
 </div>
-<div class="content">
-    <h3><?= $this->translate('Downtime detail information') ?></h3>
-<table class="avp">
-  <tbody>
+<div class="content"><h2><?= $this->translate('Details') ?></h2>
+  <table class="name-value-table">
+    <tbody>
       <tr>
-          <th>
-              <?= $this->isService ? $this->translate('Service') : $this->translate('Host') ?>
-          </th>
-          <td data-base-target="_next">
-              <?php if ($this->isService): ?>
-              <?php
-                  $link = $this->link()->service(
-                       $downtime->service_description,
-                       $downtime->service_display_name,
-                       $downtime->host_name,
-                       $downtime->host_display_name
-                  );
-                  $icon = $this->icon('service', $this->translate('Service'));
-               ?>
-              <?php else: ?>
-              <?php
-                  $icon = $this->icon('host', $this->translate('Host'));
-                  $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
-              ?>
-              <?php endif ?>
-              <?= $icon ?>
-              <?= $link ?>
-          </td>
+        <th>
+            <?= $this->isService ? $this->translate('Service') : $this->translate('Host') ?>
+        </th>
+        <td data-base-target="_next">
+          <?php if ($this->isService): ?>
+          <?php
+              $link = $this->link()->service(
+                   $downtime->service_description,
+                   $downtime->service_display_name,
+                   $downtime->host_name,
+                   $downtime->host_display_name
+              );
+              $icon = $this->icon('service', $this->translate('Service'));
+           ?>
+          <?php else: ?>
+          <?php
+              $icon = $this->icon('host', $this->translate('Host'));
+              $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
+          ?>
+          <?php endif ?>
+          <?= $icon ?>
+          <?= $link ?>
+        </td>
       </tr>
-    <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
-      <th><?= $this->translate('Author') ?></th>
-      <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
-    </tr>
-    <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
-      <th><?= $this->translate('Comment') ?></th>
-      <td><?= $this->icon('comment', $this->translate('Comment')) ?> <?= $this->escape($this->downtime->comment) ?></td>
-    </tr>
-     <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
-      <th><?= $this->translate('Entry Time') ?></th>
-      <td><?= $this->formatDateTime($this->downtime->entry_time) ?></td>
-    </tr>
-    <tr class="newsection">
-      <th><?= $this->escape(
-          $this->downtime->is_flexible ?
-          $this->translate('Flexible') : $this->translate('Fixed')
-        );  ?></th>
-      <td>
-      <?= $this->escape(
-          $this->downtime->is_flexible ?
-          $this->translate('Flexible downtimes have a hard start and end time,'
-            . ' but also an additional restriction on the duration in which '
-            . ' the host or service may actually be down.') :
-          $this->translate('Fixed downtimes have a static start and end time.')
-        );  ?>
-      </td>
-    </tr>
-    <tr title="<?= $this->translate('The date/time the scheduled downtime is'
-            . ' supposed to start. If this is a flexible (non-fixed) downtime, '
-            . 'this refers to the earliest possible time that the downtime'
-            . ' can start'); ?>">
-      <th><?= $this->translate('Scheduled start') ?></th>
-      <td><?= $this->formatDateTime($this->downtime->scheduled_start) ?></td>
-    </tr>
-    <tr title="<?= $this->translate('The date/time the scheduled downtime is '
-            . 'supposed to end. If this is a flexible (non-fixed) downtime, '
-            . 'this refers to the last possible time that the downtime can '
-            . 'start'); ?>">
-      <th><?= $this->translate('Scheduled end') ?></th>
-      <td><?= $this->formatDateTime($this->downtime->scheduled_end) ?></td>
-    </tr>
-    <?php if ($this->downtime->is_flexible): ?>
-      <tr title="<?= $this->translate('Indicates the number of seconds that the '
-              . 'scheduled downtime should last. This is usually only needed if'
-              . ' this is a flexible downtime, which can start at a variable '
-              . 'time, but lasts for the specified duration'); ?>">
-        <th tit><?= $this->translate('Duration') ?></th>
-        <td><?= $this->formatDuration($this->downtime->duration) ?></td>
+      <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
+        <th><?= $this->translate('Author') ?></th>
+        <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
       </tr>
-      <tr title="<?= $this->translate('he date/time the scheduled downtime was'
-              . ' actually started'); ?>">
-         <th><?= $this->translate('Actual start time') ?></th>
-         <td><?= $this->formatDateTime($downtime->start) ?></td>
-       </tr>
-       <tr title="<?= $this->translate('The date/time the scheduled downtime '
-               . 'actually ended'); ?>">
-         <th><?= $this->translate('Actual end time') ?></th>
-         <td><?= $this->formatDateTime($downtime->end) ?></td>
-       </tr>
-    <?php endif; ?>
+      <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
+          <th><?= $this->translate('Entry Time') ?></th>
+          <td><?= $this->formatDateTime($this->downtime->entry_time) ?></td>
+      </tr>
+      <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
+        <th><?= $this->translate('Comment') ?></th>
+        <td class="comment-text"><?= $this->escape($this->downtime->comment) ?></td>
+      </tr>
+    </tbody>
+  </table>
 
-    <tr class="newsection">
-      <th><?= $this->translate('In effect') ?></th>
-      <td>
-      <?= $this->escape(
-          $this->downtime->is_in_effect ?
-          $this->translate('Yes') : $this->translate('No')
-        );
-      ?>
-      </td>
-    </tr>
+  <h2> <?= $this->translate('Duration') ?> </h2>
 
-    <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
-    <tr class="newsection">
-      <th><?= $this->translate('Commands') ?></th>
-      <td>
-        <?= $delDowntimeForm ?>
-      </td>
-    </tr>
-    <?php endif ?>
-  </tbody>
-</table>
+  <table class="name-value-table">
+    <tbody>
+      <tr class="newsection">
+        <th><?= $this->escape(
+            $this->downtime->is_flexible ?
+            $this->translate('Flexible') : $this->translate('Fixed')
+          );  ?>
+            <?= $this->icon('info-circled', $this->downtime->is_flexible ?
+                $this->translate('Flexible downtimes have a hard start and end time,'
+                    . ' but also an additional restriction on the duration in which '
+                    . ' the host or service may actually be down.') :
+                $this->translate('Fixed downtimes have a static start and end time.')) ?>
+        </th>
+        <td>
+            <?php if ($downtime->is_flexible): ?>
+                <?php if ($downtime->is_in_effect): ?>
+                    <?= sprintf(
+                        $isService
+                            ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                            : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+                        $this->formatDate($downtime->start),
+                        $this->formatTime($downtime->start),
+                        $this->formatDuration($downtime->duration),
+                        $this->formatDate($downtime->end),
+                        $this->formatTime($downtime->end)
+                    ) ?>
+                <?php else: ?>
+                    <?= sprintf(
+                        $isService
+                            ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                            : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+                        $this->formatDateTime($downtime->scheduled_start),
+                        $this->formatDateTime($downtime->scheduled_end),
+                        $this->formatDuration($downtime->duration)
+                    ) ?>
+                <?php endif ?>
+            <?php else: ?>
+                <?php if ($downtime->is_in_effect): ?>
+                    <?= sprintf(
+                        $isService
+                            ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                            : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+                        $this->formatDate($downtime->start),
+                        $this->formatTime($downtime->start),
+                        $this->formatDate($downtime->end),
+                        $this->formatTime($downtime->end)
+                    ) ?>
+                <?php else: ?>
+                    <?= sprintf(
+                        $isService
+                            ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                            : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+                        $this->formatDate($downtime->start),
+                        $this->formatTime($downtime->start),
+                        $this->formatDate($downtime->end),
+                        $this->formatTime($downtime->end)
+                    ) ?>
+                <?php endif ?>
+            <?php endif ?>
+        </td>
+      </tr>
+      <tr title="<?= $this->translate('The date/time the scheduled downtime is'
+              . ' supposed to start. If this is a flexible (non-fixed) downtime, '
+              . 'this refers to the earliest possible time that the downtime'
+              . ' can start'); ?>">
+        <th><?= $this->translate('Scheduled start') ?></th>
+        <td><?= $this->formatDateTime($this->downtime->scheduled_start) ?></td>
+      </tr>
+      <tr title="<?= $this->translate('The date/time the scheduled downtime is '
+              . 'supposed to end. If this is a flexible (non-fixed) downtime, '
+              . 'this refers to the last possible time that the downtime can '
+              . 'start'); ?>">
+        <th><?= $this->translate('Scheduled end') ?></th>
+        <td><?= $this->formatDateTime($this->downtime->scheduled_end) ?></td>
+      </tr>
+      <?php if ($this->downtime->is_flexible): ?>
+        <tr title="<?= $this->translate('Indicates the number of seconds that the '
+                . 'scheduled downtime should last. This is usually only needed if'
+                . ' this is a flexible downtime, which can start at a variable '
+                . 'time, but lasts for the specified duration'); ?>">
+          <th tit><?= $this->translate('Duration') ?></th>
+          <td><?= $this->formatDuration($this->downtime->duration) ?></td>
+        </tr>
+        <tr title="<?= $this->translate('he date/time the scheduled downtime was'
+                . ' actually started'); ?>">
+           <th><?= $this->translate('Actual start time') ?></th>
+           <td><?= $this->formatDateTime($downtime->start) ?></td>
+         </tr>
+         <tr title="<?= $this->translate('The date/time the scheduled downtime '
+                 . 'actually ended'); ?>">
+           <th><?= $this->translate('Actual end time') ?></th>
+           <td><?= $this->formatDateTime($downtime->end) ?></td>
+         </tr>
+      <?php endif; ?>
+
+      <tr class="newsection">
+        <th><?= $this->translate('In effect') ?></th>
+        <td>
+        <?= $this->escape(
+            $this->downtime->is_in_effect ?
+            $this->translate('Yes') : $this->translate('No')
+          );
+        ?>
+        </td>
+      </tr>
+
+      <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
+      <tr class="newsection">
+        <th><?= $this->translate('Commands') ?></th>
+        <td>
+          <?= $delDowntimeForm ?>
+        </td>
+      </tr>
+      <?php endif ?>
+    </tbody>
+  </table>
 
 </div>
 
diff --git a/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml b/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml
index fed0e12f76..e6435feac4 100644
--- a/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml
@@ -8,5 +8,5 @@
 </div>
 
 <div class="content object-command">
-    <?= $delDowntimeForm ?>
+    <?= $delAllDowntimeForm ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 9b4449cb56..73d9bf6012 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -6,7 +6,7 @@
 </div>
 
 <div class="content multi-commands">
-    <h3><?= $this->icon('reschedule') ?><?= $this->translate('Commands') ?></h3>
+    <h2> <?= $this->translate('Commands') ?> </h2>
     <?= $this->qlink(
         sprintf($this->translate('Remove all %d scheduled downtimes'), $downtimes->count()),
         $removeAllLink,
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 709b7ec336..047f1c45e5 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -11,137 +11,34 @@ if (! $this->compact): ?>
         <?= $this->render('list/components/selectioninfo.phtml'); ?>
     </div>
     <h1><?= count($downtimes) ?> <?= $this->translate('Downtimes') ?></h1>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
+  <?= $this->sortBox ?>
+  <?= $this->limiter ?>
+  <?= $this->paginator ?>
+  <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next"
-         class="action multiselect"
+         class="action action-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">
     <tbody>
-    <?php foreach ($downtimes as $downtime): ?>
-    <?php
+    <?php foreach ($downtimes as $downtime):
       if (isset($downtime->service_description)) {
-          $isService = true;
-          $stateName = Service::getStateText($downtime->service_state);
+          $this->isService = true;
+          $this->stateName = Service::getStateText($downtime->service_state);
       } else {
-          $isService = false;
-          $stateName = Host::getStateText($downtime->host_state);
+          $this->isService = false;
+          $this->stateName = Host::getStateText($downtime->host_state);
       }
+      $this->downtime = $downtime;
+      $this->displayComment = true;
     ?>
-      <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
-        <td class="state">
-        <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-          <strong><?= $this->translate('Ends'); ?></strong>
-          <br>
-          <?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
-        <?php else: ?>
-          <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-          <br>
-          <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
-        <?php endif; ?>
-        </td>
-        <td>
-        <?php if ($isService): ?>
-          <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
-            $this->escape($downtime->host_display_name) . ': ' . $this->escape($downtime->service_display_name),
-            'monitoring/downtime/show',
-            array('downtime_id' => $downtime->id),
-            array(
-              'title' => sprintf(
-                $this->translate('Show detailed information for this downtime scheduled for service %s on host %s'),
-                $downtime->service_display_name,
-                $downtime->host_display_name
-              ),
-              'class' => 'rowaction'
-            )
-          ); ?>
-        <?php else: ?>
-          <?= $this->icon('host', $this->translate('host')); ?> <?= $this->qlink(
-            $this->escape($downtime->host_display_name),
-            'monitoring/downtime/show',
-            array('downtime_id' => $downtime->id),
-            array(
-              'title' => sprintf(
-                $this->translate('Show detailed information for this downtime scheduled for host %s'),
-                $downtime->host_display_name
-              ),
-              'class' => 'rowaction'
-            )
-          ); ?>
-        <?php endif ?>
-          <br>
-          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
-          <br>
-          <small>
-        <?php if ($downtime->is_flexible): ?>
-          <?php if ($downtime->is_in_effect): ?>
-            <?= sprintf(
-              $isService
-                ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-                : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                $this->formatDate($downtime->start),
-                $this->formatTime($downtime->start),
-                $this->formatDuration($downtime->duration),
-                $this->formatDate($downtime->end),
-                $this->formatTime($downtime->end)
-            ); ?>
-          <?php else: ?>
-            <?= sprintf(
-              $isService
-                ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-                : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                $this->formatDateTime($downtime->scheduled_start),
-                $this->formatDateTime($downtime->scheduled_end),
-                $this->formatDuration($downtime->duration)
-            ); ?>
-          <?php endif ?>
-        <?php else: ?>
-          <?php if ($downtime->is_in_effect): ?>
-            <?= sprintf(
-              $isService
-                ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-                : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                $this->formatDate($downtime->start),
-                $this->formatTime($downtime->start),
-                $this->formatDate($downtime->end),
-                $this->formatTime($downtime->end)
-            ); ?>
-          <?php else: ?>
-            <?= sprintf(
-              $isService
-                ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-                : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                $this->formatDate($downtime->start),
-                $this->formatTime($downtime->start),
-                $this->formatDate($downtime->end),
-                $this->formatTime($downtime->end)
-            ); ?>
-          <?php endif ?>
-        <?php endif ?>
-          </small>
-        </td>
-        <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
-        <td style="width: 2em" data-base-target="_self">
-          <?php
-          $delDowntimeForm = clone $delDowntimeForm;
-          $delDowntimeForm->populate(
-              array(
-                  'downtime_id' => $downtime->id,
-                  'downtime_is_service' => isset($downtime->service_description)
-              )
-          );
-          echo $delDowntimeForm;
-          ?>
-        </td>
-        <?php endif ?>
-      </tr>
-<?php endforeach ?>
+    <tr>
+      <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
+    </tr>
+    <?php endforeach ?>
     </tbody>
   </table>
 <?php if (! $downtimes->hasResult()): ?>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 13bf8fe958..683375f133 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -1,64 +1,72 @@
-<table class="action">
-  <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
-    <td class="state">
-        <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-            <strong><?= $this->translate('Ends'); ?></strong>
-            <br>
-            <?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
-        <?php else: ?>
-            <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-            <br>
-            <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
-        <?php endif; ?>
-    </td>
-    <td>
-      <small>
-        <?php if ($downtime->is_flexible): ?>
-            <?php if ($downtime->is_in_effect): ?>
-              <?= sprintf(
-                $this->isService
-                  ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-                  : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                $this->formatDate($downtime->start),
-                $this->formatTime($downtime->start),
-                $this->formatDuration($downtime->duration),
-                $this->formatDate($downtime->end),
-                $this->formatTime($downtime->end)
-              ); ?>
-            <?php else: ?>
-              <?= sprintf(
-                $this->isService
-                  ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-                  : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                $this->formatDateTime($downtime->scheduled_start),
-                $this->formatDateTime($downtime->scheduled_end),
-                $this->formatDuration($downtime->duration)
-              ); ?>
-            <?php endif ?>
-            <?php else: ?>
-              <?php if ($downtime->is_in_effect): ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-                    : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                    $this->formatDate($downtime->start),
-                    $this->formatTime($downtime->start),
-                    $this->formatDate($downtime->end),
-                    $this->formatTime($downtime->end)
-                ); ?>
-              <?php else: ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-                    : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                    $this->formatDate($downtime->start),
-                    $this->formatTime($downtime->start),
-                    $this->formatDate($downtime->end),
-                    $this->formatTime($downtime->end)
-                ); ?>
-              <?php endif ?>
-            <?php endif ?>
-      </small>
-    </td>
-  </tr>
-</table>
+<td class="state-col state-<?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
+  <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
+      <strong><?= $this->translate('Ends'); ?></strong>
+      <p><?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?></p>
+  <?php else: ?>
+      <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+      <p><?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?></p>
+  <?php endif; ?>
+</td>
+<td>
+  <span class="comment-header">
+    <?php if ($isService): ?>
+        <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
+            $this->escape($downtime->host_display_name) . ': ' . $this->escape($downtime->service_display_name),
+            'monitoring/downtime/show',
+            array('downtime_id' => $downtime->id),
+            array(
+                'title' => sprintf(
+                    $this->translate('Show detailed information for this downtime scheduled for service %s on host %s'),
+                    $downtime->service_display_name,
+                    $downtime->host_display_name
+                ),
+                'class' => 'rowaction'
+            )
+        ); ?>
+    <?php else: ?>
+        <?= $this->icon('host', $this->translate('host')); ?> <?= $this->qlink(
+            $this->escape($downtime->host_display_name),
+            'monitoring/downtime/show',
+            array('downtime_id' => $downtime->id),
+            array(
+                'title' => sprintf(
+                    $this->translate('Show detailed information for this downtime scheduled for host %s'),
+                    $downtime->host_display_name
+                ),
+                'class' => 'rowaction'
+            )
+        ); ?>
+    <?php endif ?>
+
+    <?= $this->translate('by') ?>
+    <?= $this->escape($downtime->author_name) ?>
+
+    <span class="pull-right">
+          <?php if ($downtime->is_flexible): ?>
+              <?= $this->icon('magic', $this->translate('This downtime is flexible')); ?>
+          <?php endif ?>
+
+          <?php if ($downtime->is_in_effect): ?>
+              <?= $this->icon('plug', $this->translate('This downtime is in effect')); ?>
+          <?php endif ?>
+
+          <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
+          <?php
+          $delDowntimeForm = clone $delDowntimeForm;
+          $delDowntimeForm->populate(
+              array(
+                  'downtime_id' => $downtime->id,
+                  'downtime_is_service' => isset($downtime->service_description)
+              )
+          );
+          echo $delDowntimeForm;
+          ?>
+          <?php endif ?>
+    </span>
+  </span>
+  <?php if (isset ($displayComment) && $displayComment): ?>
+    <p class="comment-text">
+      <?= $this->escape($downtime->comment) ?>
+    </p>
+  <?php endif ?>
+</td>
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 e80ec72e3e..a84b6fc0a2 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -10,89 +10,17 @@ use Icinga\Module\Monitoring\Object\Service;
             break;
         }
         if ($downtime->objecttype === 'service') {
-            $isService = true;
-            $stateText = Service::getStateText($downtime->service_state);
+            $this->isService = true;
+            $this->stateName =  Service::getStateText($downtime->service_state);
         } else {
-            $isService = false;
-            $stateText = Host::getStateText($downtime->host_state);
+            $this->isService = false;
+            $this->stateName =  Host::getStateText($downtime->host_state);
         }
+        $this->downtime = $downtime;
+        $this->displayComment = false;
         ?>
-        <tr class="state <?= $stateText . ($downtime->is_in_effect ? ' handled' : '') ?>">
-            <td class="state">
-                <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-                    <strong><?= $this->translate('Ends') ?></strong>
-                    <br>
-                    <?= $this->timeUntil(
-                        $downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact
-                    ) ?>
-                <?php else: ?>
-                    <strong>
-                        <?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts') ?>
-                    </strong>
-                    <br>
-                    <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
-                <?php endif ?>
-            </td>
-            <td class="name oneline">
-                <?php if ($isService): ?>
-                    <?= $this->icon('service', $this->translate('Service')) ?>
-                    <?= $this->link()->service(
-                        $downtime->service_description,
-                        $downtime->service_display_name,
-                        $downtime->host_name,
-                        $downtime->host_display_name
-                    ) ?>
-                <?php else: ?>
-                    <?= $this->icon('host', $this->translate('Host')) ?>
-                    <?= $this->link()->host($downtime->host_name, $downtime->host_display_name) ?>
-                <?php endif ?>
-                <br>
-                <?php if ($downtime->is_flexible): ?>
-                    <?php if ($downtime->is_in_effect): ?>
-                        <?= sprintf(
-                            $isService
-                                ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-                                : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                            $this->formatDate($downtime->start),
-                            $this->formatTime($downtime->start),
-                            $this->formatDuration($downtime->duration),
-                            $this->formatDate($downtime->end),
-                            $this->formatTime($downtime->end)
-                        ) ?>
-                    <?php else: ?>
-                        <?= sprintf(
-                            $isService
-                                ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-                                : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                            $this->formatDateTime($downtime->scheduled_start),
-                            $this->formatDateTime($downtime->scheduled_end),
-                            $this->formatDuration($downtime->duration)
-                        ) ?>
-                    <?php endif ?>
-                <?php else: ?>
-                    <?php if ($downtime->is_in_effect): ?>
-                        <?= sprintf(
-                            $isService
-                                ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-                                : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                            $this->formatDate($downtime->start),
-                            $this->formatTime($downtime->start),
-                            $this->formatDate($downtime->end),
-                            $this->formatTime($downtime->end)
-                        ) ?>
-                    <?php else: ?>
-                        <?= sprintf(
-                            $isService
-                                ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-                                : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                            $this->formatDate($downtime->scheduled_start),
-                            $this->formatTime($downtime->scheduled_start),
-                            $this->formatDate($downtime->scheduled_end),
-                            $this->formatTime($downtime->scheduled_end)
-                        ) ?>
-                    <?php endif ?>
-                <?php endif ?>
-            </td>
+        <tr>
+            <?= $this->render('partials/downtime/downtime-header.phtml') ?>
         </tr>
     <?php endforeach ?>
     </tbody>