diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index 6bbf6b7..b308c5f 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -412,30 +412,4 @@
    */
   def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0))
 
-
-  /**
-    *
-    * @param icon icon name: fa-* or octicon-*, for compatibility, it accepts name of octicon without octicon- prefix.
-    * @return icon tag String
-    */
-  def menuicon(icon:String): Html = {
-    icon match {
-      case i if i.startsWith("fa-") =>
-        Html(s"""<i class="menu-icon fa ${i}"></i>""")
-      case i if i.startsWith("octicon-") =>
-        Html(s"""<i class="menu-icon octicon ${i}"></i>""")
-      case i =>
-        Html(s"""<i class="menu-icon octicon octicon-${i}"></i>""")
-    }
-  }
-
-  /**
-    * make menu icon with octicon/font-awesome with Option[String]
-    * @param icon icon name: fa-* or octicon-*, for compatibility, it accepts name of octicon without octicon- prefix.
-    * @param defaultIcon default name for icon == None
-    * @return icon tag String
-    */
-  def menuicon(icon: Option[String], defaultIcon: String): Html = {
-    menuicon(icon.getOrElse(defaultIcon))
-  }
 }
diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index a065e66..0bd5f99 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -2,7 +2,6 @@
   personalTokens: List[gitbucket.core.model.AccessToken],
   gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Applications"){
-<div class="container body">
   @gitbucket.core.account.html.menu("application", context.settings.ssh){
     <div class="panel panel-default">
       <div class="panel-heading strong">Personal access tokens</div>
@@ -49,5 +48,4 @@
       </div>
     </form>
   }
-</div>
 }
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index 757e068..9237745 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -2,7 +2,6 @@
 @import gitbucket.core.util.LDAPUtil
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Edit your profile"){
-<div class="container body">
   @gitbucket.core.account.html.menu("profile", context.settings.ssh){
     @gitbucket.core.helper.html.information(info)
     @gitbucket.core.helper.html.error(error)
@@ -61,7 +60,6 @@
       </div>
     </form>
   }
-</div>
 }
 <script>
 $(function(){
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html
index fab98ae..19470f1 100644
--- a/src/main/twirl/gitbucket/core/account/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/account/menu.scala.html
@@ -1,33 +1,32 @@
 @(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
 <div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu">
-      <li@if(active=="profile"){ class="active"}>
+      <li class="menu-item-hover @if(active=="profile"){active}">
         <a href="@context.path/@context.loginAccount.get.userName/_edit">
-          @helpers.menuicon("octicon-person")
+          <i class="menu-icon octicon octicon-person"></i>
           <span>Profile</span>
         </a>
       </li>
       @if(ssh){
-      <li@if(active=="ssh"){ class="active"}>
+      <li class="menu-item-hover @if(active=="ssh"){active}">
         <a href="@context.path/@context.loginAccount.get.userName/_ssh">
-          @helpers.menuicon("key")
+          <i class="menu-icon octicon octicon-key"></i>
           <span>SSH Keys</span>
         </a>
       </li>
       }
-      <li@if(active=="application"){ class="active"}>
+      <li class="menu-item-hover @if(active=="application"){active}">
         <a href="@context.path/@context.loginAccount.get.userName/_application">
-          @helpers.menuicon("rocket")
+          <i class="menu-icon octicon octicon-rocket"></i>
           <span>Applications</span>
         </a>
       </li>
       @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
         @menu(context).map { link =>
-          <li@if(active==link.id){ class="active"}>
+          <li class="menu-item-hover @if(active==link.id){active}">
             <a href="@context.path/@link.path">
-              @helpers.menuicon(link.icon, "octicon-plug")
+              <i class="menu-icon octicon octicon-plug"></i>
               <span>@link.label</span>
             </a>
           </li>
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index a8fe812..344a70a 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -1,7 +1,6 @@
 @(account: gitbucket.core.model.Account, sshKeys: List[gitbucket.core.model.SshKey])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.ssh.SshUtil
 @gitbucket.core.html.main("SSH Keys"){
-<div class="container body">
   @gitbucket.core.account.html.menu("ssh", context.settings.ssh){
     <div class="panel panel-default">
       <div class="panel-heading strong">SSH Keys</div>
@@ -37,5 +36,4 @@
       </div>
     </form>
   }
-</div>
 }
diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html
index 992c562..2789737 100644
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -1,37 +1,42 @@
 @(active: String)(body: Html)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
 <div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu" id="system-admin-menu-container">
-      <li@if(active=="users"){ class="active"}>
+      <li class="menu-item-hover @if(active=="users"){active}">
         <a href="@context.path/admin/users">
-          @helpers.menuicon("octicon-person")<span>User management</span>
+          <i class="menu-icon octicon octicon-person"></i>
+          <span>User management</span>
         </a>
       </li>
-      <li@if(active=="system"){ class="active"}>
+      <li class="menu-item-hover @if(active=="system"){active}">
         <a href="@context.path/admin/system">
-          @helpers.menuicon("octicon-gear")<span>System settings</span></a>
+          <i class="menu-icon octicon octicon-gear"></i>
+          <span>System settings</span></a>
       </li>
-      <li@if(active=="plugins"){ class="active"}>
+      <li class="menu-item-hover @if(active=="plugins"){active}">
         <a href="@context.path/admin/plugins">
-          @helpers.menuicon("octicon-plug")<span>Plugins</span>
+          <i class="menu-icon octicon octicon-plug"></i>
+          <span>Plugins</span>
         </a>
       </li>
-      <li@if(active=="data"){ class="active"}>
+      <li class="menu-item-hover @if(active=="data"){active}">
         <a href="@context.path/admin/data">
-          @helpers.menuicon("octicon-database")<span>Data export / import</span>
+          <i class="menu-icon octicon octicon-database"></i>
+          <span>Data export / import</span>
         </a>
       </li>
-      <li>
+      <li class="menu-item-hover">
         <a href="@context.path/console/login.jsp" target="_blank">
-          @helpers.menuicon("octicon-database")<span>H2 console</span>
+          <i class="menu-icon octicon octicon-database"></i>
+          <span>H2 console</span>
         </a>
       </li>
       @gitbucket.core.plugin.PluginRegistry().getSystemSettingMenus.map { menu =>
         @menu(context).map { link =>
           <li@if(active==link.id){ class="active"}>
             <a href="@context.path/@link.path">
-              @helpers.menuicon(link.icon, "octicon-plug")<span>@link.label</span>
+              <i class="menu-icon octicon octicon-plug"></i>
+              <span>@link.label</span>
             </a>
           </li>
         }
diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
index 83b2e01..600ea73 100644
--- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
@@ -14,7 +14,7 @@
     } else {
       <li><form class="sidebar-form"><input type="text" id="filter-box" class="form-control input-sm" placeholder="Find repository"/></form></li>
       @userRepositories.zipWithIndex.map { case (repository, i) =>
-        <li class="repo-link treeview">
+        <li class="menu-item-hover">
           @if(repository.owner == context.loginAccount.get.userName){
             <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span class="strong">@repository.name</span></a>
           } else {
@@ -30,7 +30,7 @@
     } else {
       <li><form class="sidebar-form"><input type="text" id="filter-box" class="form-control input-sm" placeholder="Find repository"/></form></li>
       @recentRepositories.zipWithIndex.map { case (repository, i) =>
-        <li class="repo-link treeview">
+        <li class="menu-item-hover">
           <a href="@helpers.url(repository)">@gitbucket.core.helper.html.repositoryicon(repository, false) <span>@repository.owner/<span class="strong">@repository.name</span></span></a>
         </li>
       }
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html
index f4cb7b0..64369ef 100644
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -38,7 +38,7 @@
     }
     <script src="@helpers.assets("/vendors/AdminLTE-2.3.8/js/app.js")" type="text/javascript"></script>
   </head>
-  <body class="skin-blue page-load sidebar-mini @if(context.sidebarCollapse){sidebar-collapse}">
+  <body class="skin-blue page-load @if(body.toString.contains("menu-item-hover")){sidebar-mini} @if(context.sidebarCollapse){sidebar-collapse}">
     <div class="wrapper">
       <header class="main-header">
         <a href="@context.path/" class="logo">
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 9385735..5ee9370 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -6,85 +6,90 @@
 @import gitbucket.core.view.helpers
 
 @menuitem(path: String, name: String, label: String, icon: String, count: Int = 0) = {
-  <li class = "treeview @if(active == name){active}">
+  <li class = "menu-item-hover @if(active == name){active}">
     @if(path.startsWith("http")){
       <a href="@path" target="_blank">
-        @helpers.menuicon(icon)
-        <span>@label</span> @if(count > 0){ <span class="label label-primary pull-right-container">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i>
+        <span>@label</span>
+        @if(count > 0){
+          <span class="pull-right-container"><span class="label label-primary pull-right-container">@count</span></span>
+        }
       </a>
     } else {
       <a href="@helpers.url(repository)@path">
-        @helpers.menuicon(icon)
-          <span>@label</span> @if(count > 0) { <span class="label label-primary pull-right-container">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i>
+        <span>@label</span>
+        @if(count > 0) {
+          <span class="pull-right-container"><span class="label label-primary pull-right">@count</span></span>
+        }
       </a>
     }
   </li>
 }
 
-  <div class="main-sidebar">
-    <div class="sidebar">
-      <ul class="sidebar-menu">
-        @menuitem("", "files", "Files", "code")
-        @if(repository.branchList.nonEmpty) {
-          @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length)
-          @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length)
+<div class="main-sidebar">
+  <div class="sidebar">
+    <ul class="sidebar-menu">
+      @menuitem("", "files", "Files", "code")
+      @if(repository.branchList.nonEmpty) {
+        @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length)
+        @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length)
+      }
+      @if(repository.repository.options.issuesOption != "DISABLE") {
+        @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")
+      } else {
+        @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl =>
+          @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened")
         }
-        @if(repository.repository.options.issuesOption != "DISABLE") {
-          @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")
-        } else {
-          @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl =>
-            @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened")
-          }
+      }
+      @if(repository.repository.options.wikiOption != "DISABLE") {
+        @menuitem("/wiki", "wiki", "Wiki", "book")
+      } else {
+        @repository.repository.options.externalWikiUrl.map { externalWikiUrl =>
+          @menuitem(externalWikiUrl, "wiki", "Wiki", "book")
         }
-        @if(repository.repository.options.wikiOption != "DISABLE") {
-          @menuitem("/wiki", "wiki", "Wiki", "book")
-        } else {
-          @repository.repository.options.externalWikiUrl.map { externalWikiUrl =>
-            @menuitem(externalWikiUrl, "wiki", "Wiki", "book")
-          }
+      }
+      @if(repository.repository.options.allowFork) {
+        @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
+      }
+      @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
+        @menuitem("/settings", "settings", "Settings", "tools")
+      }
+      @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
+        @menu(repository, context).map { link =>
+          @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby"))
         }
-        @if(repository.repository.options.allowFork) {
-          @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
-        }
-        @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
-          @menuitem("/settings", "settings", "Settings", "tools")
-        }
-        @gitbucket.core.plugin.PluginRegistry().getRepositoryMenus.map { menu =>
-          @menu(repository, context).map { link =>
-            @menuitem(link.path, link.id, link.label, link.icon.getOrElse("ruby"))
-          }
-        }
-      </ul>
-    </div>
+      }
+    </ul>
   </div>
-  <div class="content-wrapper">
-    <div class="content body clearfix">
-      <div class="headbar">
-        <div class="container">
-          @gitbucket.core.helper.html.information(info)
-          @gitbucket.core.helper.html.error(error)
-          <div class="head">
-            @gitbucket.core.helper.html.repositoryicon(repository, true)
-            <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
+</div>
+<div class="content-wrapper">
+  <div class="content body clearfix">
+    <div class="headbar">
+      <div class="container">
+        @gitbucket.core.helper.html.information(info)
+        @gitbucket.core.helper.html.error(error)
+        <div class="head">
+          @gitbucket.core.helper.html.repositoryicon(repository, true)
+          <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
 
-            @defining(repository.repository){ x =>
-              @if(repository.repository.originRepositoryName.isDefined){
-                <div class="forked">
-                  forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
-                </div>
-              }
-              @x.description.map { description =>
-                <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@Html(helpers.detectAndRenderLinks(description, repository))</div>
-              }
+          @defining(repository.repository){ x =>
+            @if(repository.repository.originRepositoryName.isDefined){
+              <div class="forked">
+                forked from <a href="@context.path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
+              </div>
             }
-          </div>
+            @x.description.map { description =>
+              <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@Html(helpers.detectAndRenderLinks(description, repository))</div>
+            }
+          }
         </div>
       </div>
-      @body
     </div>
+    @body
   </div>
 </div>
 
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 65717c4..4e22054 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -264,16 +264,6 @@
   border-radius: 3px;
 }
 
-li.repo-link, li.page-link {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-body:not(.sidebar-collapse) li.repo-link, li.page-link{
-  overflow: hidden;
-}
-
 div.box-content-bottom {
   background-color: white;
   border: 1px solid #d8d8d8;
@@ -1845,19 +1835,14 @@
   transition: none !important;
 }
 
-body.sidebar-collapse .main-sidebar li.treeview:not(:hover) span.label.pull-right-container {
+body.sidebar-collapse .main-sidebar li.menu-item-hover:not(:hover) span.pull-right-container {
   display: inline !important;
   position: absolute;
-  top: 9px;
-  right: 7px;
-  text-align: center;
+  top: 8px;
+  right: 0px;
   font-size: 9px;
-  padding: 2px 3px;
-  line-height: .9;
 }
 
-body.sidebar-collapse .main-sidebar li.treeview:hover span.label.pull-right-container {
-  left: 180px !important;
-  margin-left: 0px;
-  padding: 12px 20px 12px 20px;
+body.sidebar-collapse .main-sidebar li.treeview:not(:hover) span.pull-right-container span.label {
+  padding: 2px 4px;
 }