diff --git a/app/views/ci/status/_icon.html.haml b/app/views/ci/status/_icon.html.haml
index 64119d73e03..1ca0a55b156 100644
--- a/app/views/ci/status/_icon.html.haml
+++ b/app/views/ci/status/_icon.html.haml
@@ -1,10 +1,12 @@
 - status            = local_assigns.fetch(:status)
 - size              = local_assigns.fetch(:size, 16)
 - type              = local_assigns.fetch(:type, 'pipeline')
-- title             = local_assigns.fetch(:title, _("%{type}: %{label}" % {type: type.titleize, label: status.label}))
 - tooltip_placement = local_assigns.fetch(:tooltip_placement, "left")
 - path              = local_assigns.fetch(:path, status.has_details? ? status.details_path : nil)
 - css_classes       = "ci-status-link ci-status-icon ci-status-icon-#{status.group} has-tooltip"
+- title             = s_("PipelineStatusTooltip|Pipeline: %{ci_status}") % {ci_status: status.label}
+- if type == 'commit'
+  - title = s_("PipelineStatusTooltip|Commit: %{ci_status}") % {ci_status: status.label}
 
 - if path
   = link_to path, class: css_classes, title: title, data: { html: true, placement: tooltip_placement } do
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 973950d27aa..ef063451c4f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5362,6 +5362,12 @@ msgstr ""
 msgid "PipelineSheduleIntervalPattern|Custom"
 msgstr ""
 
+msgid "PipelineStatusTooltip|Commit: %{ci_status}"
+msgstr ""
+
+msgid "PipelineStatusTooltip|Pipeline: %{ci_status}"
+msgstr ""
+
 msgid "Pipelines"
 msgstr ""