diff --git a/app/components/jobs-item.coffee b/app/components/jobs-item.coffee
index 249ddab1..eb87dcfc 100644
--- a/app/components/jobs-item.coffee
+++ b/app/components/jobs-item.coffee
@@ -7,9 +7,13 @@ JobsItemComponent = Ember.Component.extend
   classNameBindings: ['job.state']
   classNames: ['tile', 'tile--jobs', 'row']
 
-  isBooting: (->
-    if @get('job.state') == 'received'
-      return true
+  isAnimating: (->
+    state = @get('job.state')
+    animationStates = ['received', 'queued', 'started', 'booting']
+
+    unless animationStates.indexOf(state) == -1
+      true
+
   ).property('job.state')
 
   languages: (->
diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass
index 89a0b4cf..64d3a814 100644
--- a/app/styles/app/modules/icons.sass
+++ b/app/styles/app/modules/icons.sass
@@ -121,21 +121,15 @@
 
 .icon--env
   background-image: inline-image('svg/icon-environment-dark2.svg')
-.icon--cross-red,
 .icon--job.failed,
 .icon--job.rejected
   background-image: inline-image('svg/icon-job-failed.svg')
-.icon--check-green,
 .icon--job.passed,
 .icon--job.accepted
   background-image: inline-image('svg/icon-job-passed.svg')
-.icon--error-grey,
 .icon--job.errored
   background-image: inline-image('svg/icon-job-errored.svg')
-.icon--job.started,
-.icon--job.created,
-.icon--job.queued,
-.icon--started-yellow
+.icon--job.created
   background-image: inline-image('svg/icon-job-started.svg')
 .icon--job.canceled
   background-image: inline-image('svg/icon-job-canceled.svg')
diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs
index a7a4a676..44cd01ad 100644
--- a/app/templates/components/jobs-item.hbs
+++ b/app/templates/components/jobs-item.hbs
@@ -1,6 +1,6 @@
 {{#link-to "job" repo job}}
   <div class="tile-status tile-status--job">
-    {{#if isBooting}}
+    {{#if isAnimating}}
       <svg class="svg-booting" version="1.1" width="30" height="12" viewBox="0 0 10 10" preserveAspectRatio="xMinYMid meet">
         <g>
           <circle class="bubble" fill="#CDBC2C" cx="7.686" cy="7.369" r="2"/>