diff --git a/application/layouts/scripts/parts/menu.phtml b/application/layouts/scripts/parts/menu.phtml
index 14b5bc0e7..7fdd67c23 100644
--- a/application/layouts/scripts/parts/menu.phtml
+++ b/application/layouts/scripts/parts/menu.phtml
@@ -1,16 +1,38 @@
-<?php echo ($this->sub) ? '<ul>' : '<ul class="nav nav-stacked" role="navigation" id="icinganavigation">' ?>
+<?= $this->sub ? '<ul>' : '<ul class="nav nav-stacked" role="navigation" id="icinganavigation">' ?>
     <?php foreach ($this->items as $item): ?>
-        <li class="<?php echo ($this->sub) ? 'submenu ' : '' ; echo $item->getIconClass(); echo ($this->href($this->url) === $this->href($item->getUrl())) ? ' active' : ''; ?>">
+        <?php
+        $itemClass = '';
+        if ($this->sub) {
+            $itemClass .= 'submenu ';
+        }
+        if ($this->href($this->url) === $this->href($item->getUrl())) {
+            $itemClass .= 'active ';
+        }
+        ?>
+        <li <?php if (!empty($itemClass)): ?>class="<?= $itemClass ?>"<?php endif ?>>
             <?php if($item->getUrl()): ?>
                 <a href="<?= $this->href($item->getUrl()); ?>">
             <?php endif; ?>
-                <?= ($item->getIcon()) ? $this->img($item->getIcon(), array('height' => '16px', 'width' => '16px')) : ''; ?> <?= $item->getTitle();?>
+            <?php
+            if ($icon = $item->getIcon()) {
+                echo $this->img($icon, array('height' => '16px', 'width' => '16px'));
+            }
+            ?>
+            <?php if ($iconClass = $item->getIconClass()): ?>
+            <i class="<?= $iconClass ?>"></i>
+            <?php endif ?>
+            <?= $item->getTitle();?>
             <?php if($item->getUrl()): ?>
                 </a>
             <?php endif; ?>
-            <?php if($item->hasChildren()) :
-                echo $this->partial('parts/menu.phtml', array('items' => $item->getChildren(), 'sub' => true, 'url' => $this->url));
-            endif; ?>
+            <?php
+            if($item->hasChildren()) {
+                echo $this->partial(
+                    'parts/menu.phtml',
+                    array('items' => $item->getChildren(), 'sub' => true, 'url' => $this->url)
+                );
+            }
+            ?>
         </li>
-    <?php endforeach; ?>
-</ul>
\ No newline at end of file
+    <?php endforeach ?>
+</ul>
diff --git a/public/css/icinga/navigation.less b/public/css/icinga/navigation.less
index 4f2ff7a34..f165492ce 100644
--- a/public/css/icinga/navigation.less
+++ b/public/css/icinga/navigation.less
@@ -85,10 +85,6 @@
     color: red;
 }
 
-.testclass > a{
-    color: green;
-}
-
 .active > a{
     font-weight: bold;
     text-decoration: underline;
@@ -207,4 +203,4 @@ ul.icinga-subnavigation {
 .nav > .subclass {
     text-decoration: underline;
     font-size: 16px;
-}
\ No newline at end of file
+}