diff --git a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
index 36fd262482..3ff98bec04 100644
--- a/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/BadgeNavigationItemRenderer.php
@@ -100,8 +100,16 @@ public function render(NavigationItem $item = null)
         $item->setCssClass('badge-nav-item');
         $this->setEscapeLabel(false);
         $label = $this->view()->escape($item->getLabel());
+        if (($icon = $item->getIcon()) !== null) {
+            $label = $this->view()->icon($icon) . $label;
+            $item->setIcon(null);
+        }
         $item->setLabel($this->renderBadge() . $label);
-        return parent::render($item);
+        $html = parent::render($item);
+        if ($icon) {
+            $item->setIcon(true);
+        }
+        return $html;
     }
 
     /**