Upgrade to Font Awesome v4.2

65 files changed, 133 insertions, 133 deletions

diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/_dropdown.html.haml
index e283bd2bf1d..6ff46970336 100644
--- a/app/views/projects/_dropdown.html.haml
+++ b/app/views/projects/_dropdown.html.haml
@@ -1,7 +1,7 @@
 - if current_user
   .dropdown.pull-right
     %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
-      %i.icon-reorder
+      %i.fa.fa-bars
     %ul.dropdown-menu
       - if @project.issues_enabled && can?(current_user, :write_issue, @project)
         %li
@@ -23,11 +23,11 @@
         %li.divider
         %li
           = link_to new_project_branch_path(@project) do
-            %i.icon-code-fork
+            %i.fa.fa-code-fork
             Git branch
         %li
           = link_to new_project_tag_path(@project) do
-            %i.icon-tag
+            %i.fa.fa-tag
             Git tag
 
 
diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml
index 0ae1fb3cabe..19aced75836 100644
--- a/app/views/projects/_issuable_form.html.haml
+++ b/app/views/projects/_issuable_form.html.haml
@@ -29,7 +29,7 @@
 .form-group
   .issue-assignee
     = f.label :assignee_id, class: 'control-label' do
-      %i.icon-user
+      %i.fa.fa-user
       Assign to
     .col-sm-10
       = project_users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
@@ -40,7 +40,7 @@
 .form-group
   .issue-milestone
     = f.label :milestone_id, class: 'control-label' do
-      %i.icon-time
+      %i.fa.fa-clock-o
       Milestone
     .col-sm-10= f.select(:milestone_id, milestone_options(issuable),
         { include_blank: 'Select milestone' }, { class: 'select2' })
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index 9b73f06a5be..2008f8c558d 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -1,25 +1,25 @@
 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.project-settings-nav
   = nav_link(path: 'projects#edit') do
     = link_to edit_project_path(@project), class: "stat-tab tab " do
-      %i.icon-edit
+      %i.fa.fa-pencil-square-o
       Project
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
-      %i.icon-group
+      %i.fa.fa-users
       Members
   = nav_link(controller: :deploy_keys) do
     = link_to project_deploy_keys_path(@project) do
-      %i.icon-key
+      %i.fa.fa-key
       Deploy Keys
   = nav_link(controller: :hooks) do
     = link_to project_hooks_path(@project) do
-      %i.icon-link
+      %i.fa.fa-link
       Web Hooks
   = nav_link(controller: :services) do
     = link_to project_services_path(@project) do
-      %i.icon-cogs
+      %i.fa.fa-cogs
       Services
   = nav_link(controller: :protected_branches) do
     = link_to project_protected_branches_path(@project) do
-      %i.icon-lock
+      %i.fa.fa-lock
       Protected branches
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index aca6fde2886..e5cde488c3c 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -3,7 +3,7 @@
 #tree-holder.tree-holder
   .file-holder
     .file-title
-      %i.icon-file
+      %i.fa.fa-file
       %span.file_name
         = @path
         %small= number_to_human_size @blob.size
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml
index be785dacedb..492dff437b5 100644
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -1,6 +1,6 @@
 %ul.breadcrumb.repo-breadcrumb
   %li
-    %i.icon-angle-right
+    %i.fa.fa-angle-right
     = link_to project_tree_path(@project, @ref) do
       = @project.path
   - tree_breadcrumbs(@tree, 6) do |title, path|
@@ -22,7 +22,7 @@
 %div#tree-content-holder.tree-content-holder
   %article.file-holder
     .file-title.clearfix
-      %i.icon-file
+      %i.fa.fa-file
       %span.file_name
         = blob.name
         %small= number_to_human_size blob.size
diff --git a/app/views/projects/blob/_download.html.haml b/app/views/projects/blob/_download.html.haml
index cdbfee7cc68..74a45cd8ae3 100644
--- a/app/views/projects/blob/_download.html.haml
+++ b/app/views/projects/blob/_download.html.haml
@@ -2,6 +2,6 @@
   .center
     = link_to project_raw_path(@project, @id) do
       %h1.light
-        %i.icon-download-alt
+        %i.fa.fa-arrow-circle-o-down-alt
       %h4
         Download (#{number_to_human_size blob.size})
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 08a537e0541..8e58f3c247a 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -7,19 +7,19 @@
         %span.label.label-info default
       - if @project.protected_branch? branch.name
         %span.label.label-success
-          %i.icon-lock
+          %i.fa.fa-lock
           protected
     .pull-right
       - if can?(current_user, :download_code, @project)
         = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-small'
       - if branch.name != @repository.root_ref
         = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
-          %i.icon-copy
+          %i.fa.fa-files-o
           Compare
 
       - if can_remove_branch?(@project, branch.name)
         = link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
-          %i.icon-trash
+          %i.fa.fa-trash-o
 
   - if commit
     %ul.list-unstyled
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 8bc4a8f7e98..9f2b1b59292 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -4,7 +4,7 @@
   .pull-right
     - if can? current_user, :push_code, @project
       = link_to new_project_branch_path(@project), class: 'btn btn-create' do
-        %i.icon-add-sign
+        %i.fa.fa-add-sign
         New branch
        
     .dropdown.inline
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index 3f202f7ea6b..f5a530d95f2 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -3,7 +3,7 @@
     %button{ type: "button", class: "close", "data-dismiss" => "alert"} ×
     = @error
 %h3.page-title
-  %i.icon-code-fork
+  %i.fa.fa-code-fork
   New branch
 = form_tag project_branches_path, method: :post, class: "form-horizontal" do
   .form-group
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 2bc9048b2ad..80ead5b96a8 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -2,11 +2,11 @@
   %div
     - if @notes_count > 0
       %span.btn.disabled.btn-grouped
-        %i.icon-comment
+        %i.fa.fa-comment
         = @notes_count
     .pull-left.btn-group
       %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
-        %i.icon-download-alt
+        %i.fa.fa-arrow-circle-o-down-alt
         Download as
         %span.caret
       %ul.dropdown-menu
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 8e73663939f..68852ba973f 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -18,7 +18,7 @@
 
       - if note_count > 0
         %span.label.label-gray
-          %i.icon-comment= note_count
+          %i.fa.fa-comment= note_count
 
   - if commit.description?
     .commit-row-description.js-toggle-content
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 77f795f23f2..d57659065a8 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -2,7 +2,7 @@
   .row.commits-row
     .col-md-2
       %h4
-        %i.icon-calendar
+        %i.fa.fa-calendar
         %span= day.stamp("28 Aug, 2010")
       %p= pluralize(commits.count, 'commit')
     .col-md-10
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 482a845558f..5717c24c274 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -6,7 +6,7 @@
 - if current_user && current_user.private_token
   .commits-feed-holder.hidden-xs.hidden-sm
     = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do
-      %i.icon-rss
+      %i.fa.fa-rss
       Commits feed
 
 %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml
index 2b4f36fb4b8..a0345dbd9c3 100644
--- a/app/views/projects/deploy_keys/_deploy_key.html.haml
+++ b/app/views/projects/deploy_keys/_deploy_key.html.haml
@@ -2,19 +2,19 @@
   .pull-right
     - if @available_keys.include?(deploy_key)
       = link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
-        %i.icon-plus
+        %i.fa.fa-plus
         Enable
     - else
       - if deploy_key.projects.count > 1
         = link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
-          %i.icon-off
+          %i.fa.fa-power-off
           Disable
       - else
         = link_to 'Remove', project_deploy_key_path(@project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
 
 
   = link_to project_deploy_key_path(deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first, deploy_key) do
-    %i.icon-key
+    %i.fa.fa-key
     %strong= deploy_key.title
 
   %p.light.prepend-top-10
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index f50aeba337a..6f475e0b395 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -2,7 +2,7 @@
   Deploy keys allow read-only access to the repository
 
   = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
-    %i.icon-plus
+    %i.fa.fa-plus
     New Deploy Key
 
 %p.light
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 751df6a02e9..c415ae2ddc8 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -22,7 +22,7 @@
               Wrap text
            
           = link_to '#', class: 'js-toggle-diff-comments btn btn-small' do
-            %i.icon-chevron-down
+            %i.fa.fa-chevron-down
             Diff comments
            
 
diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml
index 8ef7cc6e086..20e51d18da5 100644
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@@ -11,7 +11,7 @@
      
     = link_to '#', class: 'btn btn-small js-toggle-button' do
       Show diff stats
-      %i.icon-chevron-down
+      %i.fa.fa-chevron-down
   .file-stats.js-toggle-content.hide
     %ul.bordered-list
       - diffs.each_with_index do |diff, i|
@@ -19,23 +19,23 @@
           - if diff.deleted_file
             %span.deleted-file
               %a{href: "#diff-#{i}"}
-                %i.icon-minus
+                %i.fa.fa-minus
                 = diff.old_path
           - elsif diff.renamed_file
             %span.renamed-file
               %a{href: "#diff-#{i}"}
-                %i.icon-minus
+                %i.fa.fa-minus
                 = diff.old_path
                 \->
                 = diff.new_path
           - elsif diff.new_file
             %span.new-file
               %a{href: "#diff-#{i}"}
-                %i.icon-plus
+                %i.fa.fa-plus
                 = diff.new_path
           - else
             %span.edit-file
               %a{href: "#diff-#{i}"}
-                %i.icon-adjust
+                %i.fa.fa-adjust
                 = diff.new_path
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index d9acb685517..5ee5641b069 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -89,13 +89,13 @@
     .danger-settings.js-toggle-container
       .centered-light-block
         %h3
-          %i.icon-warning-sign
+          %i.fa.fa-exclamation-triangle
           Dangerous settings
 
         %p Project settings below may result in data loss!
         = link_to '#', class: 'btn js-toggle-button' do
           Show them to me
-          %i.icon-chevron-down
+          %i.fa.fa-chevron-down
 
       .js-toggle-content.hide
         - if can? current_user, :archive_project, @project
@@ -185,6 +185,6 @@
 .save-project-loader.hide
   .center
     %h2
-      %i.icon-spinner.icon-spin
+      %i.fa.fa-spinner.fa-spin
       Saving project.
     %p Please wait a moment, this page will automatically refresh when ready.
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 62798b51d82..5985d1fcc84 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -8,7 +8,7 @@
   = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
     .file-holder.file
       .file-title
-        %i.icon-file
+        %i.fa.fa-file
         %span.file_name
           %span.monospace.light #{@ref}:
           = @path
@@ -20,7 +20,7 @@
         .js-edit-mode-pane#preview.hide
           .center
             %h2
-              %i.icon-spinner.icon-spin
+              %i.fa.fa-spinner.fa-spin
 
     .form-group.commit_message-group
       = label_tag 'commit_message', class: "control-label" do
diff --git a/app/views/projects/fork.html.haml b/app/views/projects/fork.html.haml
index bdd75de447a..d8f5c7b98d6 100644
--- a/app/views/projects/fork.html.haml
+++ b/app/views/projects/fork.html.haml
@@ -1,6 +1,6 @@
 .alert.alert-danger.alert-block
   %h4
-    %i.icon-code-fork
+    %i.fa.fa-code-fork
     Fork Error!
   %p
     You tried to fork
@@ -15,5 +15,5 @@
 
   %p
     = link_to fork_project_path(@project), title: "Fork", class: "btn", method: "POST" do
-      %i.icon-code-fork
+      %i.fa.fa-code-fork
       Try to Fork again
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index e0a9f62752a..e3d5094ddc5 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -2,7 +2,7 @@
 .loading-graph
   .center
     %h3.page-title
-      %i.icon-spinner.icon-spin
+      %i.fa.fa-spinner.fa-spin
       Building repository graph.
     %p.slead Please wait a moment, this page will automatically refresh when ready.
 
diff --git a/app/views/projects/import.html.haml b/app/views/projects/import.html.haml
index 2b907748486..1f7fd26c646 100644
--- a/app/views/projects/import.html.haml
+++ b/app/views/projects/import.html.haml
@@ -2,7 +2,7 @@
   .save-project-loader
     .center
       %h2
-        %i.icon-spinner.icon-spin
+        %i.fa.fa-spinner.fa-spin
         Import in progress.
       %p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
       %p Please wait while we import the repository for you. Refresh at will.
diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index 82cde14e05d..1d2f3ed8118 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -10,18 +10,18 @@
   - if current_controller?(:milestones)
     %li.pull-right
       %button.btn.btn-default.sidebar-expand-button
-        %i.icon.icon-list
+        %i.icon.fa.fa-list
 
   - if current_controller?(:issues)
     - if current_user
       %li
         = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
-          %i.icon-rss
+          %i.fa.fa-rss
 
     %li.pull-right
       .pull-right
         %button.btn.btn-default.sidebar-expand-button
-          %i.icon.icon-list
+          %i.icon.fa.fa-list
         = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form'  do
           .append-right-10.hidden-xs.hidden-sm
             = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
@@ -32,5 +32,5 @@
             = hidden_field_tag :label_id, params['label_id']
         - if can? current_user, :write_issue, @project
           = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do
-            %i.icon-plus
+            %i.fa.fa-plus
             New Issue
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 1dfcd726068..e089b5fa1cf 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -20,11 +20,11 @@
       = render 'votes/votes_inline', votable: issue
     - if issue.notes.any?
       %span
-        %i.icon-comments
+        %i.fa.fa-comments
         = issue.notes.count
     - if issue.milestone
       %span
-        %i.icon-time
+        %i.fa.fa-clock-o
         = issue.milestone.title
     .pull-right
       %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
@@ -41,7 +41,7 @@
       - else
         = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue btn-close", remote: true
       = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
         Edit
 
 
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 1d0dcd7f074..0bff8bdbead 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -4,7 +4,7 @@
   .issues-filters
     .dropdown.inline
       %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %i.icon-user
+        %i.fa.fa-user
         %span.light assignee:
         - if @assignee.present?
           %strong= @assignee.name
@@ -27,7 +27,7 @@
 
     .dropdown.inline.prepend-left-10
       %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %i.icon-time
+        %i.fa.fa-clock-o
         %span.light milestone:
         - if @milestone.present?
           %strong= @milestone.title
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 5de77b8bf32..4ec362b3063 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,7 +1,7 @@
 = render "head"
 .row
   .fixed.fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
-    %i.icon-list.icon-2x
+    %i.fa.fa-list.fa-2x
   .col-md-3.responsive-side
     = render 'shared/project_filter', project_entities_path: project_issues_path(@project),
              labels: true, redirect: 'issues', entity: 'issue'
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 41532fea741..4c1ea098d98 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -4,7 +4,7 @@
   %span.pull-right.issue-btn-group
     - if can?(current_user, :write_issue, @project)
       = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
-        %i.icon-plus
+        %i.fa.fa-plus
         New Issue
     - if can?(current_user, :modify_issue, @issue)
       - if @issue.closed?
@@ -13,7 +13,7 @@
         = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
 
       = link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
         Edit
 
 .clearfix
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 2649fb55c30..647e8873e9e 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -4,7 +4,7 @@
     = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
     - if merge_request.merged?
       %small.pull-right
-        %i.icon-ok
+        %i.fa.fa-check
         MERGED
     - else
       %span.pull-right
@@ -12,7 +12,7 @@
           %span.light
             #{merge_request.source_project_namespace}:
         = truncate merge_request.source_branch, length: 25
-        %i.icon-angle-right.light
+        %i.fa.fa-angle-right.light
         = merge_request.target_branch
   .merge-request-info
     - if merge_request.author
@@ -21,11 +21,11 @@
       = render 'votes/votes_inline', votable: merge_request
     - if merge_request.notes.any?
       %span
-        %i.icon-comments
+        %i.fa.fa-comments
         = merge_request.mr_and_commit_notes.count
     - if merge_request.milestone_id?
       %span
-        %i.icon-time
+        %i.fa.fa-clock-o
         = merge_request.milestone.title
 
 
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 9c51c40d32c..d4666eacd7e 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -30,7 +30,7 @@
       .form-group
         .issue-assignee
           = f.label :assignee_id do
-            %i.icon-user
+            %i.fa.fa-user
             Assign to
           %div
             = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
@@ -39,12 +39,12 @@
       .form-group
         .issue-milestone
           = f.label :milestone_id do
-            %i.icon-time
+            %i.fa.fa-clock-o
             Milestone
           %div= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'})
       .form-group
         = f.label :label_ids do
-          %i.icon-tag
+          %i.fa.fa-tag
           Labels
         %div
           = f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2'
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 4323c8f65a4..947e8f58ae5 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -10,12 +10,12 @@
     %ul.nav.nav-pills.merge-request-tabs
       %li.notes-tab{data: {action: 'notes'}}
         = link_to project_merge_request_path(@project, @merge_request) do
-          %i.icon-comment
+          %i.fa.fa-comment
           Discussion
           %span.badge= @merge_request.mr_and_commit_notes.count
       %li.diffs-tab{data: {action: 'diffs'}}
         = link_to diffs_project_merge_request_path(@project, @merge_request) do
-          %i.icon-list-alt
+          %i.fa.fa-list-alt
           Changes
           %span.badge= @merge_request.diffs.size
 
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 0954fa8fcea..be638d7cac1 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,13 +1,13 @@
 - if can? current_user, :write_merge_request, @project
   = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do
-    %i.icon-plus
+    %i.fa.fa-plus
     New Merge Request
 %h3.page-title
   Merge Requests
 %hr
 .row
   .fixed.sidebar-expand-button.hidden-lg.hidden-md
-    %i.icon-list.icon-2x
+    %i.fa.fa-list.fa-2x
   .col-md-3.responsive-side
     = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
              labels: true, redirect: 'merge_requests', entity: 'merge_request'
@@ -15,7 +15,7 @@
     .mr-filters.append-bottom-10
       .dropdown.inline
         %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-          %i.icon-user
+          %i.fa.fa-user
           %span.light assignee:
           - if @assignee.present?
             %strong= @assignee.name
@@ -38,7 +38,7 @@
 
       .dropdown.inline.prepend-left-10
         %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-          %i.icon-time
+          %i.fa.fa-clock-o
           %span.light milestone:
           - if @milestone.present?
             %strong= @milestone.title
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index ede709ea1df..a6587403871 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,7 +1,7 @@
 - if @commits.present?
   .panel.panel-default
     .panel-heading
-      %i.icon-list
+      %i.fa.fa-list
       Commits (#{@commits.count})
     .commits.mr-commits
       - if @commits.count > 8
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 88cc8e17fa6..1ab5028c448 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -63,7 +63,7 @@
   .automerge_widget.unchecked
     %p
       %strong
-        %i.icon-spinner.icon-spin
+        %i.fa.fa-spinner.fa-spin
         Checking for ability to automatically merge…
 
   .automerge_widget.already_cannot_be_merged.hide
@@ -72,6 +72,6 @@
 
   .merge-in-progress.hide
     %p
-      %i.icon-spinner.icon-spin
+      %i.fa.fa-spinner.fa-spin
        
       Merge is in progress. Please wait. Page will be automatically reloaded.  
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml
index b77eeac6123..dc64c096edc 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -1,29 +1,29 @@
 - if @commits.any?
   .ci_widget.ci-success{style: "display:none"}
-    %i.icon-ok
+    %i.fa.fa-check
     %span CI build passed
     for #{@merge_request.last_commit_short_sha}.
     = link_to "Build page", ci_build_details_path(@merge_request)
 
 
   .ci_widget.ci-failed{style: "display:none"}
-    %i.icon-remove
+    %i.fa.fa-times
     %span CI build failed
     for #{@merge_request.last_commit_short_sha}.
     = link_to "Build page", ci_build_details_path(@merge_request)
 
   - [:running, :pending].each do |status|
     .ci_widget{class: "ci-#{status}", style: "display:none"}
-      %i.icon-time
+      %i.fa.fa-clock-o
       %span CI build #{status}
       for #{@merge_request.last_commit_short_sha}.
       = link_to "Build page", ci_build_details_path(@merge_request)
 
   .ci_widget
     %strong
-      %i.icon-spinner
+      %i.fa.fa-spinner
       Checking for CI status for #{@merge_request.last_commit_short_sha}
 
   .ci_widget.ci-error{style: "display:none"}
-    %i.icon-remove
+    %i.fa.fa-times
     %span Cannot connect to the CI server. Please check your settings and try again.
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 1c319b83e2b..276c980966a 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -6,7 +6,7 @@
       - if @merge_request.open?
         .btn-group.pull-left
           %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
-            %i.icon-download-alt
+            %i.fa.fa-arrow-circle-o-down-alt
             Download as
             %span.caret
           %ul.dropdown-menu
@@ -16,7 +16,7 @@
         = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
 
         = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
-          %i.icon-edit
+          %i.fa.fa-pencil-square-o
           Edit
       - if @merge_request.closed?
         = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
diff --git a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
index 491360af1bb..4fe5935bcf3 100644
--- a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
+++ b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
@@ -5,13 +5,13 @@
   .remove_source_branch_widget
     %p Changes merged into #{@merge_request.target_branch}. You can remove source branch now
     = link_to project_branch_path(@merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-small remove_source_branch" do
-      %i.icon-remove
+      %i.fa.fa-times
       Remove Source Branch
 
   .remove_source_branch_widget.failed.hide
     Failed to remove source branch '#{@merge_request.source_branch}'
 
   .remove_source_branch_in_progress.hide
-    %i.icon-refresh.icon-spin
+    %i.fa.fa-refresh.fa-spin
      
     Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded.  
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml
index a5f8af89d1a..5db77ab2754 100644
--- a/app/views/projects/merge_requests/show/_state_widget.html.haml
+++ b/app/views/projects/merge_requests/show/_state_widget.html.haml
@@ -34,7 +34,7 @@
   - if !@closes_issues.empty? && @merge_request.open?
     .panel-footer
       %span
-        %i.icon-ok
+        %i.fa.fa-check
         Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
         = succeed '.' do
           != gfm(issues_sentence(@closes_issues))
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 4018d132a55..1002b9513ff 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -2,7 +2,7 @@
   .pull-right
     - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
       = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
         Edit
       = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-close"
   %h4
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index f0e48a51777..03367b7cdbf 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -4,12 +4,12 @@
     Milestones
     - if can? current_user, :admin_milestone, @project
       = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
-        %i.icon-plus
+        %i.fa.fa-plus
         New Milestone
 
   .row
     .fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
-      %i.icon-list.icon-2x
+      %i.fa.fa-list.fa-2x
     .col-md-3.responsive-side
       %ul.nav.nav-pills.nav-stacked
         %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 1a495aa1c40..8263f7530a2 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -4,7 +4,7 @@
   .pull-right
     - if can?(current_user, :admin_milestone, @project)
       = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
         Edit
       - if @milestone.active?
         = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped"
@@ -70,7 +70,7 @@
 
   .pull-right
     = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-grouped", title: "New Issue" do
-      %i.icon-plus
+      %i.fa.fa-plus
       New Issue
     = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped"
 
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 52a66f64d9f..4a21b84fb85 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -4,7 +4,7 @@
     = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
       = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'
       = button_tag class: 'btn btn-success btn-search-sha' do
-        %i.icon-search
+        %i.fa.fa-search
       .inline.prepend-left-20
         .checkbox.light
           = label_tag :filter_ref do
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 949b72356d7..6c986050c45 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -23,7 +23,7 @@
           .col-sm-2
           .col-sm-10
             = link_to "#", class: 'js-toggle-button' do
-              %i.icon-edit
+              %i.fa.fa-pencil-square-o
               %span Customize repository name?
         .js-toggle-content.hide
           .form-group
@@ -39,7 +39,7 @@
           .col-sm-2
           .col-sm-10
             = link_to "#", class: 'js-toggle-button' do
-              %i.icon-upload-alt
+              %i.fa.fa-upload
               %span Import existing repository?
         .js-toggle-content.hide
           .form-group.import-url-data
@@ -74,6 +74,6 @@
 .save-project-loader.hide
   .center
     %h2
-      %i.icon-spinner.icon-spin
+      %i.fa.fa-spinner.fa-spin
       Creating project & repository.
     %p Please wait a moment, this page will automatically refresh when ready.
diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml
index 24d77344fd5..bb317e4f137 100644
--- a/app/views/projects/new_tree/show.html.haml
+++ b/app/views/projects/new_tree/show.html.haml
@@ -30,7 +30,7 @@
 
     .file-holder
       .file-title
-        %i.icon-file
+        %i.fa.fa-file
       .file-content.code
         %pre#editor= params[:content]
 
diff --git a/app/views/projects/notes/_diff_notes_with_reply.html.haml b/app/views/projects/notes/_diff_notes_with_reply.html.haml
index a01056b7166..c731baf0a65 100644
--- a/app/views/projects/notes/_diff_notes_with_reply.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply.html.haml
@@ -4,7 +4,7 @@
   %tr.notes_holder
     %td.notes_line{ colspan: 2 }
       %span.discussion-notes-count
-        %i.icon-comment
+        %i.fa.fa-comment
         = notes.count
     %td.notes_content
       %ul.notes{ rel: note.discussion_id }
diff --git a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
index 506d1fff008..789f3e19fd2 100644
--- a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
+++ b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
@@ -5,7 +5,7 @@
   - if note1
     %td.notes_line
       %span.btn.disabled
-        %i.icon-comment
+        %i.fa.fa-comment
         = notes1.count
     %td.notes_content.parallel
       %ul.notes{ rel: note1.discussion_id }
@@ -20,7 +20,7 @@
   - if note2
     %td.notes_line
       %span.btn.disabled
-        %i.icon-comment
+        %i.fa.fa-comment
         = notes2.count
     %td.notes_content.parallel
       %ul.notes{ rel: note2.discussion_id }
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 52d6719a2ed..c68b3817e79 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -31,7 +31,7 @@
 
     .note-form-option
       %a.choose-btn.btn.js-choose-note-attachment-button
-        %i.icon-paper-clip
+        %i.fa.fa-paperclip
         %span Choose File ...
        
       %span.file_name.js-attachment-filename File name...
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 394fa88e045..814bf19970c 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -6,16 +6,16 @@
       .note-header
         .note-actions
           = link_to "##{dom_id(note)}", name: dom_id(note) do
-            %i.icon-link
+            %i.fa.fa-link
             Link here
            
           - if can?(current_user, :admin_note, note) && note.editable?
             = link_to "#", title: "Edit comment", class: "js-note-edit" do
-              %i.icon-edit
+              %i.fa.fa-pencil-square-o
               Edit
              
             = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: "danger js-note-delete" do
-              %i.icon-trash.cred
+              %i.fa.fa-trash-o.cred
               Remove
         = link_to_member(@project, note.author, avatar: false)
         %span.note-last-update
@@ -23,11 +23,11 @@
 
         - if note.upvote?
           %span.vote.upvote.label.label-success
-            %i.icon-thumbs-up
+            %i.fa.fa-thumbs-up
             \+1
         - if note.downvote?
           %span.vote.downvote.label.label-danger
-            %i.icon-thumbs-down
+            %i.fa.fa-thumbs-down
             \-1
 
 
@@ -45,7 +45,7 @@
 
               .note-form-option
                 %a.choose-btn.btn.js-choose-note-attachment-button
-                  %i.icon-paper-clip
+                  %i.fa.fa-paperclip
                   %span Choose File ...
                  
                 %span.file_name.js-attachment-filename File name...
@@ -61,9 +61,9 @@
               = image_tag note.attachment.secure_url, class: 'note-image-attach'
           .attachment.pull-right
             = link_to note.attachment.secure_url, target: "_blank" do
-              %i.icon-paper-clip
+              %i.fa.fa-paperclip
               = note.attachment_identifier
               = link_to delete_attachment_project_note_path(@project, note),
                 title: "Delete this attachment", method: :delete, remote: true, data: { confirm: 'Are you sure you want to remove the attachment?' }, class: "danger js-note-attachment-delete" do
-                %i.icon-trash.cred
+                %i.fa.fa-trash-o.cred
       .clear
diff --git a/app/views/projects/notes/discussions/_active.html.haml b/app/views/projects/notes/discussions/_active.html.haml
index eb416c5b5f0..52c06ec172d 100644
--- a/app/views/projects/notes/discussions/_active.html.haml
+++ b/app/views/projects/notes/discussions/_active.html.haml
@@ -3,7 +3,7 @@
   .discussion-header
     .discussion-actions
       = link_to "#", class: "js-toggle-button" do
-        %i.icon-chevron-up
+        %i.fa.fa-chevron-up
         Show/hide discussion
     %div
       = link_to_member(@project, note.author, avatar: false)
diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml
index a928029a5e5..94f16a5f02e 100644
--- a/app/views/projects/notes/discussions/_commit.html.haml
+++ b/app/views/projects/notes/discussions/_commit.html.haml
@@ -3,7 +3,7 @@
   .discussion-header
     .discussion-actions
       = link_to "#", class: "js-toggle-button" do
-        %i.icon-chevron-up
+        %i.fa.fa-chevron-up
         Show/hide discussion
     %div
       = link_to_member(@project, note.author, avatar: false)
diff --git a/app/views/projects/notes/discussions/_outdated.html.haml b/app/views/projects/notes/discussions/_outdated.html.haml
index 4ae914c107b..52a1d342f55 100644
--- a/app/views/projects/notes/discussions/_outdated.html.haml
+++ b/app/views/projects/notes/discussions/_outdated.html.haml
@@ -3,7 +3,7 @@
   .discussion-header
     .discussion-actions
       = link_to "#", class: "js-toggle-button" do
-        %i.icon-chevron-down
+        %i.fa.fa-chevron-down
         Show/hide discussion
     %div
       = link_to_member(@project, note.author, avatar: false)
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 3980a6c0863..49a3ef4c8a7 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -35,7 +35,7 @@
             - if @project.root_ref?(branch.name)
               %span.label.label-info default
             %span.label.label-success
-              %i.icon-lock
+              %i.fa.fa-lock
           .pull-right
             - if can? current_user, :admin_project, @project
               = link_to 'Unprotect', [@project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml
index ed6f8ddd187..3b4f1a4298d 100644
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
@@ -4,7 +4,7 @@
 - if split_button == true
   %span.btn-group{class: btn_class}
     = link_to archive_project_repository_path(@project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
-      %i.icon-download-alt
+      %i.fa.fa-arrow-circle-o-down-alt
       %span Download zip
     %a.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' }
       %span.caret
@@ -13,25 +13,25 @@
     %ul.dropdown-menu{ role: 'menu' }
       %li
         = link_to archive_project_repository_path(@project, ref: ref, format: 'zip'), rel: 'nofollow' do
-          %i.icon-download-alt
+          %i.fa.fa-arrow-circle-o-down-alt
           %span Download zip
       %li
         = link_to archive_project_repository_path(@project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
-          %i.icon-download-alt
+          %i.fa.fa-arrow-circle-o-down-alt
           %span Download tar.gz
       %li
         = link_to archive_project_repository_path(@project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
-          %i.icon-download-alt
+          %i.fa.fa-arrow-circle-o-down-alt
           %span Download tar.bz2
       %li
         = link_to archive_project_repository_path(@project, ref: ref, format: 'tar'), rel: 'nofollow' do
-          %i.icon-download-alt
+          %i.fa.fa-arrow-circle-o-down-alt
           %span Download tar
 - else
   %span.btn-group{class: btn_class}
     = link_to archive_project_repository_path(@project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
-      %i.icon-download-alt
+      %i.fa.fa-arrow-circle-o-down-alt
       %span zip
     = link_to archive_project_repository_path(@project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do
-      %i.icon-download-alt
+      %i.fa.fa-arrow-circle-o-down-alt
       %span tar.gz
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 19bef02b51f..09664ed51eb 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -29,13 +29,13 @@
           - if @project.archived?
             .alert.alert-warning
               %h4
-                %i.icon-warning-sign
+                %i.fa.fa-exclamation-triangle
                 Archived project!
               %p Repository is read-only
 
           - if @project.forked_from_project
             .alert.alert-success
-              %i.icon-code-fork.project-fork-icon
+              %i.fa.fa-code-fork.project-fork-icon
               Forked from:
               %br
               = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
@@ -73,7 +73,7 @@
       %article.readme-holder#README
         = link_to project_blob_path(@project, tree_join(@repository.root_ref, readme.name)) do
           %h4.readme-file-title
-            %i.icon-file
+            %i.fa.fa-file
             = readme.name
         .wiki
           = render_readme(readme)
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index e4fdbd868c3..ada0d30c496 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -22,7 +22,7 @@
 
 .file-holder
   .file-title
-    %i.icon-file
+    %i.fa.fa-file
     %span.file_name
       = @snippet.file_name
     .options
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 9ed737b181f..bce105a033b 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -2,14 +2,14 @@
 %li
   %h4
     = link_to project_commits_path(@project, tag.name), class: "" do
-      %i.icon-tag
+      %i.fa.fa-tag
       = tag.name
     .pull-right
       - if can? current_user, :download_code, @project
         = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'
       - if can?(current_user, :admin_project, @project)
         = link_to project_tag_path(@project, tag.name), class: 'btn btn-small btn-remove remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
-          %i.icon-trash
+          %i.fa.fa-trash-o
 
   - if commit
     %ul.list-unstyled
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 6cbf99239ee..ac74e3b6d36 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -5,7 +5,7 @@
   - if can? current_user, :push_code, @project
     .pull-right
       = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
-        %i.icon-add-sign
+        %i.fa.fa-add-sign
         New tag
 
 %p.light
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 45ee61caf68..aa08b397763 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -3,7 +3,7 @@
     %button{ type: "button", class: "close", "data-dismiss" => "alert"} ×
     = @error
 %h3.page-title
-  %i.icon-code-fork
+  %i.fa.fa-code-fork
   New tag
 = form_tag project_tags_path, method: :post, class: "form-horizontal" do
   .form-group
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index 77ffab89f37..df3c914fdea 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -5,7 +5,7 @@
     group members (#{group_users_count})
     .pull-right
       = link_to members_group_path(@group), class: 'btn btn-small' do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
   %ul.well-list
     - @group.group_members.order('access_level DESC').limit(20).each do |member|
       = render 'groups/group_members/group_member', member: member, show_controls: false
diff --git a/app/views/projects/team_members/_team_member.html.haml b/app/views/projects/team_members/_team_member.html.haml
index 79b78665417..5f29b58de32 100644
--- a/app/views/projects/team_members/_team_member.html.haml
+++ b/app/views/projects/team_members/_team_member.html.haml
@@ -8,7 +8,7 @@
             = f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: "medium project-access-select span2 trigger-submit"
            
         = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
-          %i.icon-minus.icon-white
+          %i.fa.fa-minus.fa-inverse
   = image_tag avatar_icon(user.email, 32), class: "avatar s32"
   %p
     %strong= user.name
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index ec2701af0eb..f082d711865 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,7 +1,7 @@
 %article.readme-holder#README
   = link_to '#README' do
     %h4.readme-file-title
-      %i.icon-file
+      %i.fa.fa-file
       = readme.name
   .wiki
     = render_readme(readme)
diff --git a/app/views/projects/tree/_spinner.html.haml b/app/views/projects/tree/_spinner.html.haml
index 5a9e77b63df..b47ad0f41e4 100644
--- a/app/views/projects/tree/_spinner.html.haml
+++ b/app/views/projects/tree/_spinner.html.haml
@@ -1,3 +1,3 @@
 %span.log_loading.hide
-  %i.icon-spinner.icon-spin
+  %i.fa.fa-spinner.fa-spin
   Loading commit data...
diff --git a/app/views/projects/tree/_submodule_item.html.haml b/app/views/projects/tree/_submodule_item.html.haml
index 474604df654..a8ec9df2c8f 100644
--- a/app/views/projects/tree/_submodule_item.html.haml
+++ b/app/views/projects/tree/_submodule_item.html.haml
@@ -1,7 +1,7 @@
 - tree, commit = submodule_links(submodule_item)
 %tr{ class: "tree-item" }
   %td.tree-item-file-name
-    %i.icon-archive
+    %i.fa.fa-archive
     %span
       = link_to truncate(submodule_item.name, length: 40), tree
     @
diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml
index 9fe990d0fbd..1159fcadffd 100644
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -12,7 +12,7 @@
     %li
       = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do
         %small
-          %i.icon-plus
+          %i.fa.fa-plus
 
 %div#tree-content-holder.tree-content-holder
   %table#tree-slider{class: "table_#{@hex_path} tree-table" }
@@ -24,7 +24,7 @@
           .pull-left Last Commit
           .last-commit.hidden-sm.pull-left
              
-            %i.icon-angle-right
+            %i.fa.fa-angle-right
              
             %small.light
               = link_to @commit.short_id, project_commit_path(@project, @commit)
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 68d70873231..30410bc95e0 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -4,5 +4,5 @@
       Page History
     - if can?(current_user, :write_wiki, @project)
       = link_to edit_project_wiki_path(@project, @page), class: "btn btn-grouped" do
-        %i.icon-edit
+        %i.fa.fa-pencil-square-o
         Edit
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index 0a7e51e974c..a2010f3794f 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -7,13 +7,13 @@
 
   = nav_link(path: 'wikis#git_access') do
     = link_to git_access_project_wikis_path(@project) do
-      %i.icon-download-alt
+      %i.fa.fa-arrow-circle-o-down-alt
       Git Access
 
   - if can?(current_user, :write_wiki, @project)
     .pull-right
       = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-        %i.icon-plus
+        %i.fa.fa-plus
         New Page
 
 = render 'projects/wikis/new'