diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 99eb011bd..a2e68569d 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -707,7 +707,7 @@ class admin_shortcodes
 	{
 		if(e_DEBUG !== false)
 		{
-			return "<div class='navbar-right navbar-text'><span class='label label-warning'>DEBUG MODE</span>&nbsp;</div>";
+			return "<div class='navbar-right navbar-text admin-icon-debug' title='DEBUG MODE ACTIVE'>".e107::getParser()->toGlyph('fa-bug')."&nbsp;</div>";
 		}
 
 	}
@@ -1774,9 +1774,9 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$tmp[8]['image_large_src'] 	= '';
 			$tmp[8]['link_class']		= '';					
 				
-			$menu_vars['logout']['text'] = ADMINNAME; // ""; // ADMINNAME;
+			$menu_vars['logout']['text'] = ''; // ADMINNAME; // ""; // ADMINNAME;
 			$menu_vars['logout']['link'] = '#';
-			$menu_vars['logout']['image'] = $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
+			$menu_vars['logout']['image'] = $tp->toAvatar(null, array('w'=>32,'h'=>32, 'shape'=>'circle')); // $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
 			$menu_vars['logout']['image_src'] = LAN_LOGOUT;
 			$menu_vars['logout']['sub'] = $tmp;	
 		}
diff --git a/e107_themes/bootstrap3/admin_dark.css b/e107_themes/bootstrap3/admin_dark.css
index 41daff900..2f43f1948 100644
--- a/e107_themes/bootstrap3/admin_dark.css
+++ b/e107_themes/bootstrap3/admin_dark.css
@@ -66,6 +66,9 @@ select:invalid:focus {
 	box-shadow:  0px 1px 1px 0px rgba(255, 0, 0, 0.75) inset;
 }
 
+.admin-icon-debug i { color: #f89406; margin-right:10px; cursor:help}
+
+
 
 /*
 .bootstrap-select, bootstrap-select button
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 2d1a26974..3add010c2 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1305,7 +1305,7 @@ td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717);
 
 
 
-
+.navbar-nav > li > a.admin-icon-avatar { padding-top:8px; padding-bottom:5px} 
 
 
 
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 3406b2d5c..0e73f30c1 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -85,7 +85,7 @@ $E_ADMIN_NAVIGATION['button_language'] = '
 // Logout / Settings / Personalize 			
 $E_ADMIN_NAVIGATION['button_logout'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle" title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		<a class="dropdown-toggle admin-icon-avatar " title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 {LINK_IMAGE} {LINK_TEXT} 
 		<b class="caret"></b>
 		</a>