diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index c71984a5665436c8e224d0bd99bd1eccbb21bb81..ca296c85a9133a99c7eb6fcaff17bfab1b757caa 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -44,6 +44,6 @@ $added: #63c363;
 $deleted: #f77;
 
 /**
- *
+ * NProgress customize
  */
 $nprogress-color: #3498db;
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index 80b49d751b9249204ba75d80e99f8561147f3b9b..2df85629ff01978efcdb2412117a8a66692817d4 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -121,3 +121,35 @@
     border-left: 1px solid #EAEAEA;
   }
 }
+
+.fold-sidenav {
+  .page-with-sidebar {
+    padding-left: 50px;
+  }
+
+  .sidebar-wrapper {
+    width: 52px;
+    position: absolute;
+    left: 50px;
+    height: 100%;
+    margin-left: -50px;
+
+    .nav-sidebar {
+      margin-top: 20px;
+      position: fixed;
+      top: 45px;
+      width: 52px;
+
+      li a {
+        padding-left: 18px;
+        font-size: 14px;
+        padding: 10px 15px;
+        text-align: center;
+
+        & > span {
+          display: none;
+        }
+      }
+    }
+  }
+}
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 619cf6256892d2dd3b8aa64437d795c76ca65ebe..4dbfbb27c6fb67584b44d41bda0ce488c777f4df 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -2,23 +2,28 @@
   = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
     = link_to root_path, title: 'Home', class: 'shortcuts-activity' do
       %i.fa.fa-dashboard
-      Activity
+      %span
+        Activity
   = nav_link(path: 'dashboard#projects') do
     = link_to projects_dashboard_path, class: 'shortcuts-projects' do
       %i.fa.fa-cube
-      Projects
+      %span
+        Projects
   = nav_link(path: 'dashboard#issues') do
     = link_to issues_dashboard_path, class: 'shortcuts-issues' do
       %i.fa.fa-exclamation-circle
-      Issues
-      %span.count= current_user.assigned_issues.opened.count
+      %span
+        Issues
+        %span.count= current_user.assigned_issues.opened.count
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to merge_requests_dashboard_path, class: 'shortcuts-merge_requests' do
       %i.fa.fa-tasks
-      Merge Requests
-      %span.count= current_user.assigned_merge_requests.opened.count
+      %span
+        Merge Requests
+        %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :help) do
     = link_to help_path do
       %i.fa.fa-question-circle
-      Help
+      %span
+        Help
 
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index d634d39bfdf1f94d19a0e2c2713d3b61c6440b48..0c0a40a6d18d5d7c1741d25a5c2129e8630893e4 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -2,65 +2,75 @@
   = nav_link(path: 'projects#show', html_options: {class: "home"}) do
     = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
       %i.fa.fa-dashboard
-      Project
+      %span
+        Project
   - if project_nav_tab? :files
     = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
       = link_to project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree' do
         %i.fa.fa-files-o
-        Files
+        %span
+          Files
 
 
   - if project_nav_tab? :commits
     = nav_link(controller: %w(commit commits compare repositories tags branches)) do
       = link_to project_commits_path(@project, @ref || @repository.root_ref), class: 'shortcuts-commits' do
         %i.fa.fa-history
-        Commits
+        %span
+          Commits
 
   - if project_nav_tab? :network
     = nav_link(controller: %w(network)) do
       = link_to project_network_path(@project, @ref || @repository.root_ref), class: 'shortcuts-network' do
         %i.fa.fa-code-fork
-        Network
+        %span
+          Network
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
       = link_to project_graph_path(@project, @ref || @repository.root_ref), class: 'shortcuts-graphs' do
         %i.fa.fa-area-chart
-        Graphs
+        %span
+          Graphs
 
   - if project_nav_tab? :issues
     = nav_link(controller: %w(issues milestones labels)) do
       = link_to url_for_project_issues, class: 'shortcuts-issues' do
         %i.fa.fa-exclamation-circle
-        Issues
-        - if @project.used_default_issues_tracker?
-          %span.count.issue_counter= @project.issues.opened.count
+        %span
+          Issues
+          - if @project.used_default_issues_tracker?
+            %span.count.issue_counter= @project.issues.opened.count
 
   - if project_nav_tab? :merge_requests
     = nav_link(controller: :merge_requests) do
       = link_to project_merge_requests_path(@project), class: 'shortcuts-merge_requests'  do
         %i.fa.fa-tasks
-        Merge Requests
-        %span.count.merge_counter= @project.merge_requests.opened.count
+        %span
+          Merge Requests
+          %span.count.merge_counter= @project.merge_requests.opened.count
 
   - if project_nav_tab? :wiki
     = nav_link(controller: :wikis) do
       = link_to project_wiki_path(@project, :home), class: 'shortcuts-wiki' do
         %i.fa.fa-book
-        Wiki
+        %span
+          Wiki
 
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
       = link_to project_snippets_path(@project), class: 'shortcuts-snippets' do
         %i.fa.fa-file-text-o
-        Snippets
+        %span
+          Snippets
 
   - if project_nav_tab? :settings
     = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
       = link_to edit_project_path(@project), class: "stat-tab tab no-highlight" do
         %i.fa.fa-cogs
-        Settings
-        %i.fa.fa-angle-down
+        %span
+          Settings
+          %i.fa.fa-angle-down
 
   - if @project_settings_nav
     = render 'projects/settings_nav'