diff --git a/e107_tests/tests/unit/e_parse_shortcodeTest.php b/e107_tests/tests/unit/e_parse_shortcodeTest.php
index a832f1078..e5ea4160f 100644
--- a/e107_tests/tests/unit/e_parse_shortcodeTest.php
+++ b/e107_tests/tests/unit/e_parse_shortcodeTest.php
@@ -1613,6 +1613,14 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
     }
 
+    public function testGlyphShortcode()
+    {
+         $tp = e107::getParser();
+         $result = $tp->parseTemplate('{GLYPH=fa-user}');
+         $this->assertSame("<i class='fas fa-user' ><!-- --></i>", $result);
+
+    }
+
 
     public function testAddonShortcodes()
     {
diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php
index 2021b7572..285f76ebf 100644
--- a/e107_themes/bootstrap3/theme_shortcodes.php
+++ b/e107_themes/bootstrap3/theme_shortcodes.php
@@ -255,20 +255,20 @@ class theme_shortcodes extends e_shortcode
 		<li class="dropdown dropdown-avatar"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{USER_AVATAR: w=30&h=30&crop=1&shape=circle} '. $userNameLabel.' <b class="caret"></b></a>
 		<ul class="dropdown-menu">
 		<li>
-			<a href="{LM_USERSETTINGS_HREF}">{GLYPH=fa-cog}'.LAN_SETTINGS.'</a>
+			<a href="{LM_USERSETTINGS_HREF}">{GLYPH=fa-cog} '.LAN_SETTINGS.'</a>
 		</li>
 		<li>
-			<a class="dropdown-toggle no-block" role="button" href="{LM_PROFILE_HREF}">{GLYPH=fa-user}'.LAN_LOGINMENU_13.'</a>
+			<a class="dropdown-toggle no-block" role="button" href="{LM_PROFILE_HREF}">{GLYPH=fa-user} '.LAN_LOGINMENU_13.'</a>
 		</li>
 		<li class="divider"></li>';
 		
 		if(ADMIN) 
 		{
-			$text .= '<li><a href="'.e_ADMIN_ABS.'"><span class="fa fa-cogs"></span> '.LAN_LOGINMENU_11.'</a></li>';	
+			$text .= '<li><a href="'.e_ADMIN_ABS.'">{GLYPH=fa-cogs} '.LAN_LOGINMENU_11.'</a></li>';
 		}
 		
 		$text .= '
-		<li><a href="'.e_HTTP.'index.php?logout">{GLYPH=fa-off}'.LAN_LOGOUT.'</a></li>
+		<li><a href="'.e_HTTP.'index.php?logout">{GLYPH=fa-power-off} '.LAN_LOGOUT.'</a></li>
 		</ul>
 		</li>
 		</ul>