diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 538afb029..b3c50552d 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -297,9 +297,6 @@ class Web extends EmbeddedWeb
                     )
                 ),
                 'user' => array(
-                    'label'     => $this->user->getUsername(),
-                    'icon'      => 'user',
-                    'priority'  => 900,
                     'children'  => array(
                         'preferences'   => array(
                             'label'     => t('Preferences'),
@@ -316,11 +313,17 @@ class Web extends EmbeddedWeb
                             'url'       => 'authentication/logout',
                             'priority'  => 990,
                             'renderer'  => array(
-                                'NavigationItemRenderer',
+                                'LogoutNavigationItemRenderer',
                                 'target' => '_self'
                             )
                         )
-                    )
+                    ),
+                    'label'     => $this->user->getUsername(),
+                    'url'       => 'account',
+                    'priority'  => 900,
+                    'renderer'  => array(
+                        'UserNavigationItemRenderer'
+                    ),
                 )
             );
 
diff --git a/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
new file mode 100644
index 000000000..3f92d929e
--- /dev/null
+++ b/library/Icinga/Web/Navigation/Renderer/LogoutNavigationItemRenderer.php
@@ -0,0 +1,14 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Navigation\Renderer;
+
+use Icinga\Web\Navigation\NavigationItem;
+
+class LogoutNavigationItemRenderer extends NavigationItemRenderer
+{
+    public function render(NavigationItem $item = null)
+    {
+        return '<div class="user-nav-item">' . parent::render($item) . '</div>';
+    }
+}
diff --git a/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
new file mode 100644
index 000000000..36cfd0709
--- /dev/null
+++ b/library/Icinga/Web/Navigation/Renderer/UserNavigationItemRenderer.php
@@ -0,0 +1,22 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Navigation\Renderer;
+
+use Icinga\Web\Navigation\NavigationItem;
+
+class UserNavigationItemRenderer extends NavigationItemRenderer
+{
+    public function getAvatar()
+    {
+        return '<img class="pull-left user-avatar"
+                     src="/icingaweb2/static/gravatar?email=icinga%40localhost"
+                     alt="Avatar"
+                     aria-hidden="true">';
+    }
+
+    public function render(NavigationItem $item = null)
+    {
+        return '<div class="user-nav-item clearfix">' . $this->getAvatar() . parent::render($item) . '</div>';
+    }
+}
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 5cf9e4f0b..67323c1b3 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -143,3 +143,8 @@ a.button {
     .bg-color-critical();
   }
 }
+
+.user-avatar {
+  height: 16px;
+  width: 16px;
+}