diff --git a/UI/Cells/AirDateCell.js b/UI/Cells/AirDateCell.js
deleted file mode 100644
index e40aa06fb..000000000
--- a/UI/Cells/AirDateCell.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-define(
-    [
-        'backgrid',
-        'moment',
-        'Shared/FormatHelpers'
-    ], function (Backgrid, Moment, FormatHelpers) {
-        return Backgrid.Cell.extend({
-            className: 'air-date-cell',
-
-            render: function () {
-
-                this.$el.empty();
-                var date = this.model.get(this.column.get('name'));
-
-                if (date) {
-                    this.$el.html('<div>' + FormatHelpers.DateHelper(date) + '</div>');
-
-                    this.$el.children('div').attr('title', Moment(date).format('LLLL'));
-                }
-
-                return this;
-
-            }
-        });
-    });
diff --git a/UI/Cells/RelativeDateCell.js b/UI/Cells/RelativeDateCell.js
index f8e4ea4ba..c411a731e 100644
--- a/UI/Cells/RelativeDateCell.js
+++ b/UI/Cells/RelativeDateCell.js
@@ -14,8 +14,7 @@ define(
                 var date = this.model.get(this.column.get('name'));
 
                 if (date) {
-                    this.$el.html(FormatHelpers.DateHelper(date));
-                    this.$el.attr('title', Moment(date).format('LLLL'));
+                    this.$el.html("<span title='" + Moment(date).format('LLLL') + "' >" + FormatHelpers.DateHelper(date) + "</span");
                 }
 
                 return this;
diff --git a/UI/Cells/ToggleCell.js b/UI/Cells/ToggleCell.js
index d15de4c08..71ab9fcaf 100644
--- a/UI/Cells/ToggleCell.js
+++ b/UI/Cells/ToggleCell.js
@@ -14,18 +14,19 @@ define(
 
 
             _onClick: function () {
+
                 var self = this;
 
+                this.$el.tooltip('hide');
+
                 var name = this.column.get('name');
                 this.model.set(name, !this.model.get(name));
 
                 this.$('i').addClass('icon-spinner icon-spin');
 
-                var promise = this.model.save();
-
-                promise.always(function (){
-                    self.render();
-                });
+                this.model.save().always(function () {
+                        self.render();
+                    });
             },
 
             render: function () {
@@ -44,7 +45,7 @@ define(
                 var tooltip = this.column.get('tooltip');
 
                 if (tooltip) {
-                    this.$('i').attr('title', tooltip);
+                    this.$el.attr('title', tooltip);
                 }
 
                 return this;
diff --git a/UI/Missing/MissingLayout.js b/UI/Missing/MissingLayout.js
index 5080f25bb..1abad6cd1 100644
--- a/UI/Missing/MissingLayout.js
+++ b/UI/Missing/MissingLayout.js
@@ -7,10 +7,10 @@ define(
         'Cells/SeriesTitleCell',
         'Cells/EpisodeNumberCell',
         'Cells/EpisodeTitleCell',
-        'Cells/AirDateCell',
+        'Cells/RelativeDateCell',
         'Shared/Grid/Pager',
         'Shared/LoadingView'
-    ], function (Marionette, Backgrid, MissingCollection, SeriesTitleCell, EpisodeNumberCell, EpisodeTitleCell, AirDateCell, GridPager, LoadingView) {
+    ], function (Marionette, Backgrid, MissingCollection, SeriesTitleCell, EpisodeNumberCell, EpisodeTitleCell, RelativeDateCell, GridPager, LoadingView) {
         return Marionette.Layout.extend({
             template: 'Missing/MissingLayoutTemplate',
 
@@ -43,7 +43,7 @@ define(
                     {
                         name : 'airDateUtc',
                         label: 'Air Date',
-                        cell : AirDateCell
+                        cell : RelativeDateCell
                     }
                 ],
 
diff --git a/UI/Series/Details/SeasonLayout.js b/UI/Series/Details/SeasonLayout.js
index e35c59711..5b2485217 100644
--- a/UI/Series/Details/SeasonLayout.js
+++ b/UI/Series/Details/SeasonLayout.js
@@ -5,11 +5,11 @@ define(
         'backgrid',
         'Cells/ToggleCell',
         'Cells/EpisodeTitleCell',
-        'Cells/AirDateCell',
+        'Cells/RelativeDateCell',
         'Cells/EpisodeStatusCell',
         'Commands/CommandController',
         'Shared/Actioneer'
-    ], function ( Marionette, Backgrid, ToggleCell, EpisodeTitleCell, AirDateCell, EpisodeStatusCell, CommandController, Actioneer) {
+    ], function ( Marionette, Backgrid, ToggleCell, EpisodeTitleCell, RelativeDateCell, EpisodeStatusCell, CommandController, Actioneer) {
         return Marionette.Layout.extend({
             template: 'Series/Details/SeasonLayoutTemplate',
 
@@ -56,7 +56,7 @@ define(
                     {
                         name : 'airDateUtc',
                         label: 'Air Date',
-                        cell : AirDateCell
+                        cell : RelativeDateCell
                     } ,
                     {
                         name    : 'status',
diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js
index e9300b1c2..2dcb7afc0 100644
--- a/UI/Series/Index/SeriesIndexLayout.js
+++ b/UI/Series/Index/SeriesIndexLayout.js
@@ -6,7 +6,7 @@ define(
         'Series/Index/List/CollectionView',
         'Series/Index/EmptyView',
         'Series/SeriesCollection',
-        'Cells/AirDateCell',
+        'Cells/RelativeDateCell',
         'Cells/SeriesTitleCell',
         'Cells/TemplatedCell',
         'Cells/QualityProfileCell',
@@ -19,7 +19,7 @@ define(
                  ListCollectionView,
                  EmptyView,
                  SeriesCollection,
-                 AirDateCell,
+                 RelativeDateCell,
                  SeriesTitleCell,
                  TemplatedCell,
                  QualityProfileCell,
@@ -66,7 +66,7 @@ define(
                     {
                         name : 'nextAiring',
                         label: 'Next Airing',
-                        cell : AirDateCell
+                        cell : RelativeDateCell
                     },
                     {
                         name    : 'this',