diff --git a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
index 424c5489a..cabac9ae9 100644
--- a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
@@ -113,6 +113,12 @@ abstract class BadgeNavigationItemRenderer extends NavigationItemRenderer
     protected function renderBadge()
     {
         if ($count = $this->getCount()) {
+            if ($count > 1000000) {
+                $count = round($count, -6) / 1000000 . 'M';
+            } elseif ($count > 1000) {
+                $count = round($count, -3) / 1000 . 'k';
+            }
+
             $view = $this->view();
             return sprintf(
                 '<span title="%s" class="badge state-%s">%s</span>',
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index fce9565a4..6c3cb7d68 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -294,8 +294,24 @@ html.no-js .controls > .tabs {
   }
 
   #menu {
-    .badge {
-      display: none;
+    .nav-level-1 {
+      > .badge-nav-item > a {
+        position: relative;
+
+        > .badge {
+          position: absolute;
+          right: .5em;
+          bottom: .25em;
+          font-size: 75%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          max-width: 4em;
+        }
+      }
+
+      > .nav-item.active > a > .badge {
+        display: unset;
+      }
     }
 
     img.icon {