diff --git a/UI/Calendar/CalendarView.js b/UI/Calendar/CalendarView.js
index 8ef8da33c..03b517965 100644
--- a/UI/Calendar/CalendarView.js
+++ b/UI/Calendar/CalendarView.js
@@ -18,8 +18,8 @@ define(['app', 'Calendar/Collection','fullcalendar'], function () {
                     right : 'month,basicWeek'
                 },
                 buttonText    : {
-                    prev: '<i class='icon-arrow-left'></i>',
-                    next: '<i class='icon-arrow-right'></i>'
+                    prev: '<i class="icon-arrow-left"></i>',
+                    next: '<i class="icon-arrow-right"></i>'
                 },
                 events        : this.getEvents,
                 eventRender   : function (event, element) {
diff --git a/UI/Cells/EpisodeStatusCell.js b/UI/Cells/EpisodeStatusCell.js
index bad5c3770..34a7b3533 100644
--- a/UI/Cells/EpisodeStatusCell.js
+++ b/UI/Cells/EpisodeStatusCell.js
@@ -25,7 +25,7 @@ define(['app','backgrid' ], function () {
                     }
                 }
 
-                this.$el.html('<i class='{0}'/>'.format(icon));
+                this.$el.html('<i class="{0}"/>'.format(icon));
             }
 
             return this;
diff --git a/UI/History/EventTypeCell.js b/UI/History/EventTypeCell.js
index eb7755681..173e95a49 100644
--- a/UI/History/EventTypeCell.js
+++ b/UI/History/EventTypeCell.js
@@ -32,7 +32,7 @@ define(['app', 'Cells/NzbDroneCell' ], function () {
 
                 }
 
-                this.$el.html('<i class='{0}' title='{1}'/>'.format(icon, toolTip));
+                this.$el.html('<i class="{0}" title="{1}"/>'.format(icon, toolTip));
             }
 
             return this;
diff --git a/UI/Release/DownloadReportCell.js b/UI/Release/DownloadReportCell.js
index 9ccbe9a1f..34579a49d 100644
--- a/UI/Release/DownloadReportCell.js
+++ b/UI/Release/DownloadReportCell.js
@@ -13,16 +13,16 @@ define(['app','backgrid'], function () {
 
             var self = this;
 
-            this.$el.html('<i class ='icon-spinner icon-spin' />');
+            this.$el.html('<i class =\'icon-spinner icon-spin\' />');
             this.model.save()
                 .always(function () {
-                    self.$el.html('<i class ='icon-download-alt' />');
+                    self.$el.html('<i class =\'icon-download-alt\' />');
                 });
         },
 
         render: function () {
 
-            this.$el.html('<i class ='icon-download-alt' />');
+            this.$el.html('<i class =\'icon-download-alt\' />');
             return this;
 
         }
diff --git a/UI/Series/Index/Table/SeriesStatusCell.js b/UI/Series/Index/Table/SeriesStatusCell.js
index f25eeb3a1..d0e110674 100644
--- a/UI/Series/Index/Table/SeriesStatusCell.js
+++ b/UI/Series/Index/Table/SeriesStatusCell.js
@@ -9,14 +9,14 @@ define(['app','backgrid'], function () {
             var status = this.model.get('status');
 
             if (!monitored) {
-                this.$el.html('<i class='icon-pause grid-icon' title='Not Monitored'></i>');
+                this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
             }
             else if (status === 'continuing') {
-                this.$el.html('<i class='icon-play grid-icon' title='Continuing'></i>');
+                this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
             }
 
             else {
-                this.$el.html('<i class='icon-stop grid-icon' title='Ended'></i>');
+                this.$el.html('<i class="icon-stop grid-icon" title="Ended"></i>');
             }
 
             return this;
diff --git a/UI/Settings/Misc/MiscView.js b/UI/Settings/Misc/MiscView.js
index e08c72b83..2fa69c9b0 100644
--- a/UI/Settings/Misc/MiscView.js
+++ b/UI/Settings/Misc/MiscView.js
@@ -4,12 +4,7 @@ define(['marionette', 'Mixins/AsModelBoundview'], function (Marionette, AsModelB
 
     var view = Marionette.ItemView.extend({
         template : 'Settings/Misc/MiscTemplate',
-        className: 'form-horizontal',
-
-        ui: {
-            tooltip: '[class^='help-inline'] i'
-        }
-
+        className: 'form-horizontal'
     });
 
     return AsModelBoundView.call(view);
diff --git a/UI/Shared/Grid/HeaderCell.js b/UI/Shared/Grid/HeaderCell.js
index 0fb2f69a5..7c4c3d923 100644
--- a/UI/Shared/Grid/HeaderCell.js
+++ b/UI/Shared/Grid/HeaderCell.js
@@ -14,7 +14,7 @@ define(['app','backgrid'], function () {
 
             if (this.column.get('sortable')) {
                 this.$el.addClass('clickable');
-                this.$el.append(' <i class='pull-right'></i>');
+                this.$el.append(' <i class="pull-right"></i>');
 
                 if (this.collection.state) {
                     var sortKey = this.collection.state.sortKey;
diff --git a/UI/Shared/TemplateHelpers.js b/UI/Shared/TemplateHelpers.js
index c18485bb8..d1adfa748 100644
--- a/UI/Shared/TemplateHelpers.js
+++ b/UI/Shared/TemplateHelpers.js
@@ -1,43 +1,48 @@
 'use strict';
 
-define(['app','handlebars','Shared/FormatHelpers'], function (App,Handlebars) {
-    Handlebars.registerHelper('partial', function (templateName) {
-        //TODO: We should be able to pass in the context, either an object or a property
-
-        var templateFunction = Marionette.TemplateCache.get(templateName);
-        return new Handlebars.SafeString(templateFunction(this));
-    });
-
-    Handlebars.registerHelper('debug', function (optionalValue) {
-        console.log('Current Context');
-        console.log('====================');
-        console.log(this);
-
-        if (optionalValue) {
-            console.log('Value');
+define(
+    [
+        'app',
+        'handlebars',
+        'Shared/FormatHelpers'
+    ], function (App, Handlebars) {
+        Handlebars.registerHelper('partial', function (templateName) {
+            //TODO: We should be able to pass in the context, either an object or a property
+
+            var templateFunction = Marionette.TemplateCache.get(templateName);
+            return new Handlebars.SafeString(templateFunction(this));
+        });
+
+        Handlebars.registerHelper('debug', function (optionalValue) {
+            console.log('Current Context');
             console.log('====================');
-            console.log(optionalValue);
-        }
-    });
-
-    Handlebars.registerHelper('fileSize', function (size) {
-        return new Handlebars.SafeString(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size));
-    });
-
-    Handlebars.registerHelper('date', function (date) {
-        //TODO: show actual date in tooltip
-        if (!date) {
-            return '';
-        }
-
-        var shortDate = Date.create(date).short();
-        var formattedDate = NzbDrone.Shared.FormatHelpers.DateHelper(date);
-        var result = '<span title='' + shortDate + ''>' + formattedDate + '</span>';
-
-        return new Handlebars.SafeString(result);
-    });
-
-    Handlebars.registerHelper('defaultImg', function () {
-        return new Handlebars.SafeString('onerror='this.src=\'/content/images/poster-dark.jpg\';'');
+            console.log(this);
+
+            if (optionalValue) {
+                console.log('Value');
+                console.log('====================');
+                console.log(optionalValue);
+            }
+        });
+
+        Handlebars.registerHelper('fileSize', function (size) {
+            return new Handlebars.SafeString(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size));
+        });
+
+        Handlebars.registerHelper('date', function (date) {
+            //TODO: show actual date in tooltip
+            if (!date) {
+                return '';
+            }
+
+            var shortDate = Date.create(date).short();
+            var formattedDate = NzbDrone.Shared.FormatHelpers.DateHelper(date);
+            var result = '<span title="' + shortDate + '">' + formattedDate + '</span>';
+
+            return new Handlebars.SafeString(result);
+        });
+
+        Handlebars.registerHelper('defaultImg', function () {
+            return new Handlebars.SafeString('onerror="this.src="/content/images/poster-dark.jpg";"');
+        });
     });
-});