diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
index 041b24e..12a4656 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -239,7 +239,7 @@
 
 }
 
-case class Link(id: String, label: String, path: String)
+case class Link(id: String, label: String, path: String, icon: Option[String] = None)
 
 case class PluginInfo(
   pluginId: String,
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index b451b1a..0704d03 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -6,13 +6,16 @@
 @import context._
 @import gitbucket.core.view.helpers._
 
-@menuitem(path: String, name: String, label: String, count: Int = 0) = {
+@menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = {
   <li @if(active == name){class="active"}>
     <a href="@url(repository)@path">
-      @label
-      @if(count > 0){
-        <span class="badge">@count</span>
-      }
+      <i class="menu-icon octicon octicon-@icon"></i>
+      <span class="pc">
+        @label
+        @if(count > 0){
+          <span class="badge">@count</span>
+        }
+      </span>
     </a>
   </li>
 }
@@ -41,23 +44,23 @@
 <div class="container body">
   <div class="main-sidebar">
     <ul class="nav nav-pills nav-stacked">
-      @menuitem(""                   ,"files"      ,"Files")
+      @menuitem(""                   ,"files"      ,"Files", "code")
       @if(repository.commitCount != 0) {
-        @menuitem("/branches"        ,"branches"   ,"Branches", repository.branchList.length)
-        @menuitem("/tags"            ,"tags"       ,"Tags", repository.tags.length)
+        @menuitem("/branches"        ,"branches"   ,"Branches", "git-branch", repository.branchList.length)
+        @menuitem("/tags"            ,"tags"       ,"Tags", "tag", repository.tags.length)
       }
-      @menuitem("/issues"            ,"issues"     ,"Issues", repository.issueCount)
-      @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", repository.pullCount)
-      @menuitem("/issues/labels"     ,"labels"     ,"Labels")
-      @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
-      @menuitem("/wiki"              ,"wiki"       ,"Wiki")
-      @menuitem("/network/members", "fork", "Forks", repository.forkedCount)
+      @menuitem("/issues"            ,"issues"     ,"Issues", "issue-opened", repository.issueCount)
+      @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", "git-pull-request", repository.pullCount)
+      @menuitem("/issues/labels"     ,"labels"     ,"Labels", "tag")
+      @menuitem("/issues/milestones" ,"milestones" ,"Milestones", "milestone")
+      @menuitem("/wiki"              ,"wiki"       ,"Wiki", "book")
+      @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
       @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-        @menuitem("/settings" , "settings" , "Settings")
+        @menuitem("/settings" , "settings" , "Settings", "tools")
       }
       @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
         @menu(repository, context).map { link =>
-          @menuitem(link.path, link.id, link.label)
+          @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby"))
         }
       }
     </ul>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6b2ca4b..713326c 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1864,19 +1864,29 @@
   input[name=query] {
     display: none;
   }
-  #dashboard-signin-form {
-    display: none;
-  }
   .container {
     width: auto !important;
   }
-  .body>div.pull-left {
-    width: auto !important;
-  }
   .pc {
     display: none;
   }
 
+  div.dashboard-sidebar {
+    display: none;;
+  }
+  div.dashboard-content {
+    margin-left: 0px;
+  }
+
+  div.main-sidebar {
+    width: 40px;
+    float: left;
+  }
+  div.main-content {
+    margin-left: 42px;
+  }
+
+
   /* Adjust issue / comment form */
   #issue-title {
     width: 100% !important;
@@ -1904,17 +1914,8 @@
     overflow: hidden;
     display: inline-block;
   }
-/*
-  .nav-tabs a.btn[href$="/_edit"] {
-    width: 24px;
-    white-space: nowrap;
-    overflow: hidden;
-    padding: 4px 6px;
-    margin: 3px 4px 0 0;
-  }
-*/
   body>div.container.body {
-    margin: 0 -12px 40px -12px;
+    margin: 0 0 40px -12px;
   }
   /* Adjust sidemenu */
   .container.body>div[style="width: 170px;"]{