diff --git a/app/helpers/runners_helper.rb b/app/helpers/runners_helper.rb
index bf551778cb3..46eb82a354f 100644
--- a/app/helpers/runners_helper.rb
+++ b/app/helpers/runners_helper.rb
@@ -15,7 +15,7 @@ module RunnersHelper
   end
 
   def runner_link(runner)
-    display_name = truncate(runner.display_name, length: 20)
+    display_name = truncate(runner.display_name, length: 15)
     id = "\##{runner.id}"
 
     if current_user && current_user.admin
diff --git a/app/views/projects/builds/_build.html.haml b/app/views/projects/builds/_build.html.haml
index ff146f7389b..4ce4ed63b40 100644
--- a/app/views/projects/builds/_build.html.haml
+++ b/app/views/projects/builds/_build.html.haml
@@ -9,6 +9,9 @@
     - else
       %strong Build ##{build.id}
 
+    - if build.show_warning?
+      %i.fa.fa-warning.text-warning
+
   %td
     = link_to build.short_sha, namespace_project_commit_path(@project.namespace, @project, build.sha)
 
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 91c1b16c9f6..c45bfb27b8f 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -44,16 +44,14 @@
       .bs-callout.bs-callout-warning
         %p
           - if no_runners_for_project?(@build.project)
-            This build is stuck, because the project doesn't have runners assigned.
+            This build is stuck, because the project doesn't have any runners online assigned to it.
           - elsif @build.tags.any?
-            This build is stuck.
-            %br
-            This build is stuck, because you don't have any active runners online with these tags assigned to the project:
+            This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
             - @build.tags.each do |tag|
               %span.label.label-primary
                 = tag
           - else
-            This build is stuck, because you don't have any active runners online that can run this build.
+            This build is stuck, because you don't have any active runners that can run this build.
 
           %br
           Go to