diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 19471ea091..c736046762 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -150,7 +150,7 @@ protected function createListTabs()
         $tabs = $this->getTabs();
         $tabs->add('userbackend', array(
             'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-            'label' => $this->translate('Authentication'),
+            'label' => $this->translate('Users'),
             'url'   => 'config/userbackend'
         ));
         $tabs->add('usergroupbackend', array(
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 2d1cff1f5a..f664447855 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -39,7 +39,8 @@ class StyleSheet
         'css/icinga/controls.less',
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
-        'css/icinga/spinner.less'
+        'css/icinga/spinner.less',
+        'css/icinga/compat.less',
     );
 
     public static function compileForPdf()
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 8086794f83..5582cf0846 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -40,7 +40,7 @@ if ($object->acknowledged): ?>
                     <?= nl2br($this->createTicketLinks($acknowledgement->getComment()), false) ?>
                 </dd>
             <?php if ($acknowledgement->expires()): ?>
-                <dd>
+                <dd class="text-small">
                     <?= sprintf(
                         $this->translate('Expires %s'),
                         $this->timeUntil($acknowledgement->getExpirationTime())
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index ad1f376f3e..489547c6e6 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -47,7 +47,7 @@ if (empty($object->comments) && ! $addLink) {
     <?php if (empty($object->downtimes)):
         echo $addLink;
     else: ?>
-        <ul class="inline-comments">
+        <dl class="feed-list">
         <?php foreach ($object->downtimes as $downtime):
             if ((bool) $downtime->is_in_effect) {
                 $state = sprintf(
@@ -75,6 +75,7 @@ if (empty($object->comments) && ! $addLink) {
             // Form is unset if the current user lacks the respective permission
             if (isset($delDowntimeForm)) {
                 $deleteButton = clone($delDowntimeForm);
+                $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' pull-right');
                 $deleteButton->populate(
                     array(
                         'downtime_id'           => $downtime->id,
@@ -85,20 +86,19 @@ if (empty($object->comments) && ! $addLink) {
                 $deleteButton = '';
             }
             ?>
-            <li class="comment-item">
-                <h3>
-                    <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                    <?= $this->timeAgo($downtime->entry_time) ?>
-                    <?= $deleteButton ?>
-                </h3>
-                <p>
-                    <span class="sr-only"><?= $this->translate('Downtime') ?></span>
-                    <?= $state ?> -
+            <dt class="clearfix feed-author">
+                <span class="author"><?= $this->escape($downtime->author_name) ?></span>
+                <?= $this->timeAgo($downtime->entry_time) ?>
+                <?= $deleteButton ?>
+             </dt>
+             <dd class="comment-text">
                     <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)) ?>
-                </p>
-             </li>
+            </dd>
+            <dd class="text-small">
+                <?= $state ?>
+            </dd>
         <?php endforeach ?>
-        </ul>
+        </dl>
     <?php endif ?>
     </td>
 </tr>
diff --git a/modules/monitoring/application/views/scripts/show/components/flags.phtml b/modules/monitoring/application/views/scripts/show/components/flags.phtml
index 1ecc788b7c..98398e4e5d 100644
--- a/modules/monitoring/application/views/scripts/show/components/flags.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/flags.phtml
@@ -1,3 +1,3 @@
-<tr class="newsection">
-    <td colspan="2" data-base-target="_self"><?= $toggleFeaturesForm ?></td>
-</tr>
+<div data-base-target="_self">
+    <?= $toggleFeaturesForm ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
index f3cff23cca..dfb6e95acc 100644
--- a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
@@ -1,4 +1,6 @@
 <?php if ($object->perfdata): ?>
 <h2><?= $this->translate('Performance data') ?></h2>
-<?= $this->perfdata($object->perfdata) ?>
+<div class="performance-data">
+    <?= $this->perfdata($object->perfdata) ?>
+</div>
 <?php endif ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 1d7e907d07..576d829de9 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -404,6 +404,13 @@ form.object-features .control-label {
     }
 }
 
+.performance-data ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  padding-left: @vertical-padding;
+}
+
 
 //p.pluginoutput {
 //  width: 100%;
diff --git a/public/css/icinga/compat.less b/public/css/icinga/compat.less
new file mode 100644
index 0000000000..82792f12ad
--- /dev/null
+++ b/public/css/icinga/compat.less
@@ -0,0 +1,35 @@
+@colorMainLayout: @icinga-blue;
+@colorMainBackground: @body-bg-color;
+@colorMainForeground: @text-color;
+@colorMainLink: @text-color;
+@colorSecondary: @gray-lightest;
+@colorGray: @gray-lightest;
+@colorLinkDefault: @text-color;
+@colorTextDefault: @text-color;
+@colorTextDarkDefault: @text-color;
+@colorOk: @color-ok;
+@colorWarning: #ffaa44;
+@colorWarningHandled: #ffcc66;
+@colorCritical: #ff5566;
+@colorCriticalHandled: #ff99aa;
+@colorUnknown: #aa44ff;
+@colorUnknownHandled: #cc77ff;
+@colorUnreachable: #aa44ff;
+@colorUnreachableHandled: #cc77ff;
+@colorPending: #77aaff;
+@colorInvalid: #999;
+@colorFormNotificationInfo: #77aaff;
+@colorFormNotificationWarning: #ffaa44;
+@colorFormNotificationError: #ff5566;
+@colorPetrol: @icinga-blue;
+
+table.action {
+  .action-table();
+  a {
+    font-weight: normal;
+  }
+}
+
+table.avp {
+  .name-value-table()
+}
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 75ace39986..0f9a2f5157 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -103,23 +103,23 @@ dl.feed-list {
 
   dt {
     border-bottom: 1px solid @gray-lighter;
-    
+    margin-top: @vertical-padding;
+
     .icon-cancel {
       display: none;
     }
+
+    &:hover {
+      background-color: @gray-lightest;
+      .icon-cancel {
+        display: block;
+      }
+    }
+
+    &:first-child {
+      margin-top: 0;
+    }
   }
-    dt:hover { 
-        background: #F9F9F9;
-        position: relative;
-
-        form { 
-            display: inline;
-        } 
-
-    	.icon-cancel {
-      	display: inline;
-    	}
-    } 
 }
 
 dl.name-value-list {