diff --git a/CHANGELOG b/CHANGELOG
index a06509c7c79..dabaa7377e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -58,6 +58,7 @@ v 7.11.0 (unreleased)
   - Fix automatic blocking of auto-created users from Active Directory.
   - Call merge request web hook for each new commits (Arthur Gautier)
   - Use SIGKILL by default in Sidekiq::MemoryKiller
+  - Spin spinner icon next to "Checking for CI status..." on MR page.
 
 v 7.10.2
   - Fix CI links on MR page
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 ffa3f7b0e36..3b1cd53df37 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -1,34 +1,34 @@
 - if @commits.any?
   .ci_widget.ci-success{style: "display:none"}
-    %i.fa.fa-check
+    = icon("check")
     %span CI build passed
     for #{@merge_request.last_commit_short_sha}.
     = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
 
   .ci_widget.ci-failed{style: "display:none"}
-    %i.fa.fa-times
+    = icon("times")
     %span CI build failed
     for #{@merge_request.last_commit_short_sha}.
     = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
   - [:running, :pending].each do |status|
     .ci_widget{class: "ci-#{status}", style: "display:none"}
-      %i.fa.fa-clock-o
+      = icon("clock-o")
       %span CI build #{status}
       for #{@merge_request.last_commit_short_sha}.
       = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
   .ci_widget
-    %i.fa.fa-spinner
+    = icon("spinner spin")
     Checking for CI status for #{@merge_request.last_commit_short_sha}
 
   .ci_widget.ci-canceled{style: "display:none"}
-    %i.fa.fa-times
+    = icon("times")
     %span CI build canceled
     for #{@merge_request.last_commit_short_sha}.
     = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
   .ci_widget.ci-error{style: "display:none"}
-    %i.fa.fa-times
+    = icon("times")
     %span Cannot connect to the CI server. Please check your settings and try again.