diff --git a/userpanel/style/bclean/body.html b/userpanel/style/bclean/body.html
index 72e3c0fe1d..6b84b3d708 100644
--- a/userpanel/style/bclean/body.html
+++ b/userpanel/style/bclean/body.html
@@ -32,8 +32,7 @@ <h1>
 				{foreach $menuitems as $menuitem}
 					<li class="nav-item {if strpos($smarty.get.m, $menuitem.module) !== false && strlen($smarty.get.m)==strlen($menuitem.module) }active{/if}">
 						<a class="nav-link" href="?m={$menuitem.module}" id="lms-userpanel-menu-item-{$menuitem.module}" {userpaneltip text=$menuitem.tip}>
-							{if $menuitem.icon}<i class="{$menuitem.icon}"></i>{/if}
-							{$menuitem.name|replace:" ":"&nbsp;"}
+							{icon name=$menuitem.icon label="{$menuitem.name|replace:" ":"&nbsp;"}"}
 							<i class="warning-icon"></i>
 						</a>
 					</li>
diff --git a/userpanel/style/bclean/style.less b/userpanel/style/bclean/style.less
index 30047bb38d..6d825636eb 100644
--- a/userpanel/style/bclean/style.less
+++ b/userpanel/style/bclean/style.less
@@ -158,9 +158,22 @@ nav.navbar {
     vertical-align: middle;
 }
 i + .lms-ui-label {
-    padding-left: 0.5em;
+    padding-left: 0.35em;
 }
 
 .table td, .table th {
     vertical-align: middle;
 }
+
+.lms-ui-button,
+.navbar .nav-link {
+    display: inline-flex;
+    align-items: center;
+    line-height: 1.5;
+    padding-left: 0.8em;
+    padding-right: 0.8em;
+}
+
+.navbar .nav-link i {
+    margin-right: 0.4em;
+}