diff --git a/app/components/loading-indicator.coffee b/app/components/loading-indicator.coffee
index a076ae52..d4af3f17 100644
--- a/app/components/loading-indicator.coffee
+++ b/app/components/loading-indicator.coffee
@@ -2,7 +2,7 @@
 
 LoadingIndicatorComponent = Ember.Component.extend
   tagName: 'div'
-  classNameBindings: ['center:loading-container', 'inline:inline-block']
+  classNameBindings: ['center:loading-container', 'inline:inline-block', 'height:icon-height']
   center: false
 
 `export default LoadingIndicatorComponent`
diff --git a/app/styles/app/components/loading-indicator.sass b/app/styles/app/components/loading-indicator.sass
index 80729325..5d3301b2 100644
--- a/app/styles/app/components/loading-indicator.sass
+++ b/app/styles/app/components/loading-indicator.sass
@@ -32,4 +32,9 @@
 .loading-indicator--white
   @extend .loading-indicator
   i
-    background-color: $white
\ No newline at end of file
+    background-color: $white
+
+.icon-height
+  .loading-indicator
+    height: 28px
+    margin-bottom: .5em
diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass
index 45d7d080..421ccc42 100644
--- a/app/styles/app/layouts/buildheader.sass
+++ b/app/styles/app/layouts/buildheader.sass
@@ -129,12 +129,12 @@
     &:hover
       background-color: darken($grey-medium, 10)
   .icon--trigger
-    width: .95em
-    height: 1.3em
+    width: 15px
+    height: 19px
     margin-left: 6px
   .icon--cancel
-    width: 1em
-    height: 1em
+    width: 16px
+    height: 16px
     margin-left: 6px
   .icon--codeclimate
     width: 1.2em
diff --git a/app/styles/app/modules/flash.sass b/app/styles/app/modules/flash.sass
index 4934dfa3..de509f7a 100644
--- a/app/styles/app/modules/flash.sass
+++ b/app/styles/app/modules/flash.sass
@@ -2,6 +2,7 @@
   @include resetul
   font-size: 18px
   text-align: center
+  height: 0
   li
     top: 0
     position: relative
@@ -22,7 +23,7 @@
     height: 1.1rem
 
   p
-    padding: .7em 0
+    padding: .4em 0
     margin: 0
 
   li.broadcast p
diff --git a/app/templates/components/build-repo-actions.hbs b/app/templates/components/build-repo-actions.hbs
index b38ea9ca..d1534e80 100644
--- a/app/templates/components/build-repo-actions.hbs
+++ b/app/templates/components/build-repo-actions.hbs
@@ -1,9 +1,8 @@
 {{#if canCancel}}
   {{#if cancelling}}
-    {{loading-indicator}}
+    {{loading-indicator height=true}}
   {{else}}
-    <a href="#" {{action "cancel"}} class="button-circle"
-       title="Cancel Build">
+    <a href="#" {{action "cancel"}} class="button-circle" title="Cancel Build">
       <span class="icon icon--cancel"></span>
     </a>
   {{/if}}
@@ -11,7 +10,7 @@
 
 {{#if canRestart}}
   {{#if restarting}}
-    {{loading-indicator}}
+    {{loading-indicator height=true}}
   {{else}}
     <a href="#" {{action "restart"}} class="button-circle" title="Restart Build">
       <span class="icon icon--trigger"></span>
diff --git a/app/templates/components/job-repo-actions.hbs b/app/templates/components/job-repo-actions.hbs
index 05e423d1..62548e53 100644
--- a/app/templates/components/job-repo-actions.hbs
+++ b/app/templates/components/job-repo-actions.hbs
@@ -1,6 +1,6 @@
 {{#if canCancel}}
   {{#if cancelling}}
-    {{loading-indicator}}
+    {{loading-indicator height=true}}
   {{else}}
     <a href="#" {{action "cancel"}} class="button-circle" title="Cancel Job">
       <span class="icon icon--cancel"></span>
@@ -10,7 +10,7 @@
 
 {{#if canRestart}}
   {{#if restarting}}
-    {{loading-indicator}}
+    {{loading-indicator height=true}}
   {{else}}
     <a href="#" {{action "restart"}} class="button-circle" title="Restart Job">
       <span class="icon icon--trigger"></span>