5 files changed, 12 insertions, 12 deletions
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