diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index a766d6e77ab..717f17dc601 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -171,6 +171,17 @@
   }
 }
 
+.project .event_filter {
+  position: static;
+  float: left;
+  width: 100%;
+  margin-left: 0;
+  a {
+    margin-right: 10px;
+    width: 50px;
+  }
+}
+
 /*
  * Last push widget
  */
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index 188f40fe4f9..9db56055f24 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -111,6 +111,11 @@ body.project {
     &:active, &:focus {
       text-decoration: none;
     }
+
+    i {
+      width: 20px;
+      color: #999;
+    }
   }
 }
 
@@ -153,6 +158,7 @@ body.project {
 
   .content-wrapper {
     padding: 20px;
+    border-left: 1px solid #EAEAEA;
   }
 }
 
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 000bb1475db..c9ae3f5ffff 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,26 +1,37 @@
 %ul.project-navigation.nav.nav-sidebar.navbar-collapse.collapse
   = 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
   - if project_nav_tab? :files
     = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
-      = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree'
+      = link_to project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree' do
+        %i.fa.fa-files-o
+        Files
+
 
   - if project_nav_tab? :commits
     = nav_link(controller: %w(commit commits compare repositories tags branches)) do
-      = link_to "Commits", project_commits_path(@project, @ref || @repository.root_ref), class: 'shortcuts-commits'
+      = link_to project_commits_path(@project, @ref || @repository.root_ref), class: 'shortcuts-commits' do
+        %i.fa.fa-history
+        Commits
 
   - if project_nav_tab? :network
     = nav_link(controller: %w(network)) do
-      = link_to "Network", project_network_path(@project, @ref || @repository.root_ref), class: 'shortcuts-network'
+      = link_to project_network_path(@project, @ref || @repository.root_ref), class: 'shortcuts-network' do
+        %i.fa.fa-code-fork
+        Network
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
-      = link_to "Graphs", project_graph_path(@project, @ref || @repository.root_ref), class: 'shortcuts-graphs'
+      = link_to project_graph_path(@project, @ref || @repository.root_ref), class: 'shortcuts-graphs' do
+        %i.fa.fa-area-chart
+        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
@@ -28,20 +39,26 @@
   - 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
 
   - if project_nav_tab? :wiki
     = nav_link(controller: :wikis) do
-      = link_to 'Wiki', project_wiki_path(@project, :home), class: 'shortcuts-wiki'
+      = link_to project_wiki_path(@project, :home), class: 'shortcuts-wiki' do
+        %i.fa.fa-book
+        Wiki
 
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
-      = link_to 'Snippets', project_snippets_path(@project), class: 'shortcuts-snippets'
+      = link_to project_snippets_path(@project), class: 'shortcuts-snippets' do
+        %i.fa.fa-file-text-o
+        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
   - if defined?(settings) && settings