diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
index 04b01df..0137466 100644
--- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
@@ -3,10 +3,10 @@
 @import gitbucket.core.view.helpers._
 <div class="container headbar">
   <ul class="nav nav-tabs">
-    <li @if(active == ""){ class="active"}><a href="@path/"><i class="octicon octicon-rss"></i> News Feed</a></li>
+    <li @if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
     @if(loginAccount.isDefined){
-      <li @if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls"><i class="octicon octicon-git-pull-request"></i> Pull Requests</a></li>
-      <li @if(active == "issues"){ class="active"}><a href="@path/dashboard/issues"><i class="octicon octicon-issue-opened"></i> Issues</a></li>
+      <li @if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li>
+      <li @if(active == "issues"){ class="active"}><a href="@path/dashboard/issues">Issues</a></li>
     }
   </ul>
 </div>
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index e14a92f..2e077f2 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -6,10 +6,10 @@
 @import context._
 @import gitbucket.core.view.helpers._
 
-@menuitem(path: String, name: String, icon: String, label: String, count: Int = 0) = {
+@menuitem(path: String, name: String, label: String, count: Int = 0) = {
   <li @if(active == name){class="active"}>
     <a href="@url(repository)@path">
-      <i class="menu-icon @if(active == name){menu-icon-active} octicon octicon-@{icon} "></i> <span class="pc">@label</span>
+      @label
       @if(count > 0){
         <span class="badge">@count</span>
       }
@@ -55,14 +55,14 @@
       }
     </div>
     <ul class="nav nav-tabs">
-      @menuitem(""       , "code"   , "code" , "Code")
-      @menuitem("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
-      @menuitem("/pulls" , "pulls"  , "git-pull-request" , "Pull Requests", repository.pullCount)
-      @menuitem("/wiki"  , "wiki"   , "book"  , "Wiki")
+      @menuitem(""       , "code"   , "Code")
+      @menuitem("/issues", "issues" , "Issues", repository.issueCount)
+      @menuitem("/pulls" , "pulls"  , "Pull Requests", repository.pullCount)
+      @menuitem("/wiki"  , "wiki"   , "Wiki")
       @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-        @menuitem("/settings" , "settings" , "tools", "Settings")
+        @menuitem("/settings" , "settings" , "Settings")
       }
-      @menuitem("/network/members", "fork", "git-branch", "Forks", repository.forkedCount)
+      @menuitem("/network/members", "fork", "Forks", repository.forkedCount)
     </ul>
   </div>
 </div>