diff --git a/UI/Cells/EpisodeStatusCell.js b/UI/Cells/EpisodeStatusCell.js
index d20e96052..bef528f72 100644
--- a/UI/Cells/EpisodeStatusCell.js
+++ b/UI/Cells/EpisodeStatusCell.js
@@ -41,21 +41,21 @@ define(
                     }
                     else {
                         if (this.model.get('downloading')) {
-                            icon = 'icon-download-alt';
+                            icon = 'icon-nd-downloading';
                             tooltip = 'Episode is downloading';
                         }
 
                         else if (!this.model.get('airDateUtc')) {
-                            icon = 'icon-question-sign';
+                            icon = 'icon-nd-tba';
                             tooltip = 'TBA';
                         }
 
                         else if (hasAired) {
-                            icon = 'icon-warning-sign';
+                            icon = 'icon-nd-missing';
                             tooltip = 'Episode missing from disk';
                         }
                         else {
-                            icon = 'icon-time';
+                            icon = 'icon-nd-not-aired';
                             tooltip = 'Episode has not aired';
                         }
                     }
diff --git a/UI/Content/icons.less b/UI/Content/icons.less
index efcb632d2..131b4f381 100644
--- a/UI/Content/icons.less
+++ b/UI/Content/icons.less
@@ -89,4 +89,20 @@
 
 .icon-nd-update:before {
   .icon(@download-alt);
+}
+
+.icon-nd-downloading:before {
+  .icon(@download-alt);
+}
+
+.icon-nd-tba:before {
+  .icon(@question-sign);
+}
+
+.icon-nd-missing:before {
+  .icon(@warning-sign);
+}
+
+.icon-nd-not-aired:before {
+  .icon(@time);
 }
\ No newline at end of file