adjust icon css

public/less/_base.less

@@ -84,9 +84,6 @@ pre {
 		}
   }
 }
-i.icon {
-	margin-right: 0!important;
-}
 .ui {
 	&.left {
 		float: left;

public/less/_dashboard.less

@@ -14,9 +14,14 @@
 		.filter.menu {
 			.item {
 				text-align: left;
+				.text {
+					height: 16px;
+			    vertical-align: middle;
+				}
 				.floating.label {
 					top: 7px;
-					left: 95%;
+					left: 90%;
+					width: 15%;
 				}
 			}
 			.item.active {
@@ -24,7 +29,7 @@
 		    color: #FFF;
 			}
 			.item .text {
-				width: 90%;
+				width: 85%;
 			}
 		}
 		.ui.right .head.menu {
@@ -33,5 +38,10 @@
 				color: #d9453d;
 			}
 		}
+		.head.menu {
+			.octicon {
+				margin-right: 5px;
+			}
+		}
 	}
 }

templates/user/dashboard/navbar.tmpl

@@ -31,13 +31,13 @@
   <div class="ui right">
     <div class="ui secondary head menu">
       <a class="{{if .PageIsNews}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
-        <i class="icon octicon octicon-rss"></i>&nbsp;{{.i18n.Tr "news_feed"}}
+        <i class="octicon octicon-rss"></i>&nbsp;{{.i18n.Tr "news_feed"}}
       </a>
       <a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues">
-        <i class="icon octicon octicon-issue-opened"></i>&nbsp;{{.i18n.Tr "issues"}}
+        <i class="octicon octicon-issue-opened"></i>&nbsp;{{.i18n.Tr "issues"}}
       </a>
       <a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls">
-        <i class="icon octicon octicon-git-pull-request"></i>&nbsp;{{.i18n.Tr "pull_requests"}}
+        <i class="octicon octicon-git-pull-request"></i>&nbsp;{{.i18n.Tr "pull_requests"}}
       </a>
       <div class="right menu">
         <div class="item">