10 files changed, 32 insertions, 18 deletions
diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml
index 9b54cbe577a..8946ab898e0 100644
--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -1,8 +1,9 @@
 - page_title _('Bitbucket import')
 - header_title _('Projects'), root_path
 
-%h3.page-title
-  %i.fa.fa-bitbucket
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
   = _('Import projects from Bitbucket')
 
 = render 'import/githubish_status', provider: 'bitbucket'
diff --git a/app/views/import/bitbucket_server/new.html.haml b/app/views/import/bitbucket_server/new.html.haml
index 735535ffc36..19c28d53087 100644
--- a/app/views/import/bitbucket_server/new.html.haml
+++ b/app/views/import/bitbucket_server/new.html.haml
@@ -3,8 +3,10 @@
 - breadcrumb_title title
 - header_title _("Projects"), root_path
 
-%h3.page-title
-  = icon 'bitbucket-square', text: _('Import repositories from Bitbucket Server')
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
+  = _('Import repositories from Bitbucket Server')
 
 %p
   = _('Enter in your Bitbucket Server URL and personal access token below')
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index b3ca1beb853..7c4e6913c53 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -1,8 +1,9 @@
 - page_title _('Bitbucket Server import')
 - header_title _('Projects'), root_path
 
-%h3.page-title
-  %i.fa.fa-bitbucket-square
+%h3.page-title.d-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
   = _('Import projects from Bitbucket Server')
 
 = render 'import/githubish_status', provider: 'bitbucket_server', paginatable: true, extra_data: { reconfigure_path: configure_import_bitbucket_server_path }
diff --git a/app/views/import/bulk_imports/status.html.haml b/app/views/import/bulk_imports/status.html.haml
new file mode 100644
index 00000000000..d909f6a13f0
--- /dev/null
+++ b/app/views/import/bulk_imports/status.html.haml
@@ -0,0 +1 @@
+- page_title 'Bulk Import'
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml
index e86d4236be8..7e49cad7902 100644
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -10,7 +10,9 @@
   = import_github_authorize_message
 
 - if github_import_configured? && !has_ci_cd_only_params?
-  = link_to icon('github', text: title), status_import_github_path, class: 'btn btn-success'
+  = link_to status_import_github_path, class: 'btn btn-success gl-button' do
+    = sprite_icon('github', css_class: 'gl-mr-2')
+    = title
 
   %hr
 
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index ee295e70cce..ba6a5657d12 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -2,7 +2,9 @@
 - page_title title
 - breadcrumb_title title
 - header_title _("Projects"), root_path
-%h3.page-title.mb-0
-  = icon 'github', class: 'fa-2x', text: _('Import repositories from GitHub')
+%h3.page-title.mb-0.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('github', css_class: 'gl-mr-2')
+  = _('Import repositories from GitHub')
 
 = render 'import/githubish_status', provider: 'github'
diff --git a/app/views/import/google_code/new.html.haml b/app/views/import/google_code/new.html.haml
index 7dec67191b9..1edd224956c 100644
--- a/app/views/import/google_code/new.html.haml
+++ b/app/views/import/google_code/new.html.haml
@@ -1,7 +1,8 @@
 - page_title _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 %hr
 
diff --git a/app/views/import/google_code/new_user_map.html.haml b/app/views/import/google_code/new_user_map.html.haml
index 1f1bfda7ee4..833987dea4e 100644
--- a/app/views/import/google_code/new_user_map.html.haml
+++ b/app/views/import/google_code/new_user_map.html.haml
@@ -1,7 +1,8 @@
 - page_title _("User map"), _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 %hr
 
diff --git a/app/views/import/google_code/status.html.haml b/app/views/import/google_code/status.html.haml
index 22984d59afe..72112c128cb 100644
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
@@ -1,7 +1,8 @@
 - page_title _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 
 - if @repos.any?
diff --git a/app/views/import/shared/_errors.html.haml b/app/views/import/shared/_errors.html.haml
index de60c15351f..32b4a39924b 100644
--- a/app/views/import/shared/_errors.html.haml
+++ b/app/views/import/shared/_errors.html.haml
@@ -1,4 +1,6 @@
 - if @errors.present?
-  .alert.alert-danger
-    - @errors.each do |error|
-      = error
+  .gl-alert.gl-alert-danger.gl-mb-5
+    = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+    .gl-alert-body
+      - @errors.each do |error|
+        = error