6 files changed, 15 insertions, 12 deletions
diff --git a/app/views/import/_project_status.html.haml b/app/views/import/_project_status.html.haml
index 280bcbc1e63..b968db58d38 100644
--- a/app/views/import/_project_status.html.haml
+++ b/app/views/import/_project_status.html.haml
@@ -3,7 +3,7 @@
   = icon('check')
   = _('Done')
 - when 'started'
-  = icon("spinner spin")
+  = loading_icon
   = _('Started')
 - when 'failed'
   = _('Failed')
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index 626080c284b..4daa769215f 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -1,7 +1,8 @@
 - page_title _("FogBugz Import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-bug
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bug', css_class: 'gl-mr-2')
   = _('Import projects from FogBugz')
 %hr
 
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index cdc53520e93..fb93a3eca0d 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -1,7 +1,8 @@
 - page_title _('User map'), _('FogBugz import')
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-bug
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bug', css_class: 'gl-mr-2')
   = _('Import projects from FogBugz')
 %hr
 
diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml
index f201c0e83fe..e04a412e3bc 100644
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@@ -1,7 +1,8 @@
 - page_title _("FogBugz import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-bug
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bug', css_class: 'gl-mr-2')
   = _('Import projects from FogBugz')
 
 %p.light
diff --git a/app/views/import/google_code/status.html.haml b/app/views/import/google_code/status.html.haml
index 8d8754e1069..22984d59afe 100644
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
@@ -15,11 +15,11 @@
   - if @incompatible_repos.any?
     = button_tag class: "btn btn-import btn-success js-import-all" do
       = _("Import all compatible projects")
-      = icon("spinner spin", class: "loading-icon")
+      = loading_icon(css_class: 'loading-icon')
   - else
     = button_tag class: "btn btn-import btn-success js-import-all" do
       = _("Import all projects")
-      = icon("spinner spin", class: "loading-icon")
+      = loading_icon(css_class: 'loading-icon')
 
 .table-responsive
   %table.table.import-jobs
@@ -45,7 +45,7 @@
                 %i.fa.fa-check
                 = _("done")
             - when 'started'
-              %i.fa.fa-spinner.fa-spin
+              = loading_icon
               = _("started")
             - else
               = project.human_import_status_name
@@ -59,7 +59,7 @@
           %td.import-actions.job-status
             = button_tag class: "btn btn-import js-add-to-import" do
               = _("Import")
-              = icon("spinner spin", class: "loading-icon")
+              = loading_icon(css_class: 'loading-icon')
       - @incompatible_repos.each do |repo|
         %tr{ id: "repo_#{repo.id}" }
           %td
diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml
index 3a5b5924c6a..2ee964974c3 100644
--- a/app/views/import/manifest/_form.html.haml
+++ b/app/views/import/manifest/_form.html.haml
@@ -16,7 +16,7 @@
     = file_field_tag :manifest, class: 'form-control-file w-auto', required: true
     .form-text.text-muted
       = _('Import multiple repositories by uploading a manifest file.')
-      = link_to icon('question-circle'), help_page_path('user/project/import/manifest')
+      = link_to sprite_icon('question-o'), help_page_path('user/project/import/manifest')
 
   .gl-mb-3
     = submit_tag _('List available repositories'), class: 'btn btn-success'