diff --git a/app/assets/stylesheets/pages/icons.scss b/app/assets/stylesheets/pages/icons.scss
index 3293dc2029d97f437e715bacddfc4dab8e223f22..226bd2ead31e5f20b6e9054119cc5d74f9f393d8 100644
--- a/app/assets/stylesheets/pages/icons.scss
+++ b/app/assets/stylesheets/pages/icons.scss
@@ -15,7 +15,7 @@
 }
 
 .ci-status-icon-pending,
-.ci-status-icon-success_with_warning {
+.ci-status-icon-success_with_warnings {
   color: $gl-warning;
 
   svg {
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index e97b610a07b780daafa82fcb1638596d3974e108..1de4674f3e77e0cd69584c04939a6f1ca6e81a21 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -114,11 +114,6 @@
       overflow: visible;
     }
   }
-
-
-
-
-
 }
 
 .visible-xs-inline {
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 2a2d24be736e8d361cfc7791ae3d1b43c4719608..4c7b14a04dbc931d128cdf671e23ebc08f690962 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -4,8 +4,9 @@
 
 %tr.commit
   %td.commit-link
-    = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
-      = ci_status_with_icon(status)
+    = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "ci-status ci-#{status}" do
+      = ci_icon_for_status(status)
+      = ci_label_for_status(status)
 
   %td
     = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index a82c846baa709dd737e91755a887b198af6c9c33..09c41f947b0f48e7497d167632ac3dd466697fbc 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,7 +1,7 @@
 - if @pipeline
   .mr-widget-heading
     - %w[success success_with_warnings skipped canceled failed running pending].each do |status|
-      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
+      .ci_widget{ class: "ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) }
         = ci_icon_for_status(status)
         %span
           Pipeline