diff --git a/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs b/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
index f8041a1b81..0a09d9d577 100644
--- a/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
@@ -29,7 +29,7 @@ public XbmcSettings()
         [FieldDefinition(4, Label = "Display Time", HelpText = "How long the notification will be displayed for (In seconds)")]
         public Int32 DisplayTime { get; set; }
 
-        [FieldDefinition(5, Label = "GUI Notification", HelpText = "Show GUI notifications?", Type = FieldType.Checkbox)]
+        [FieldDefinition(5, Label = "GUI Notification", Type = FieldType.Checkbox)]
         public Boolean Notify { get; set; }
 
         [FieldDefinition(6, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)]
diff --git a/UI/Form/CheckboxTemplate.html b/UI/Form/CheckboxTemplate.html
index 477f1e0d4f..94c7dde4cf 100644
--- a/UI/Form/CheckboxTemplate.html
+++ b/UI/Form/CheckboxTemplate.html
@@ -12,7 +12,7 @@
             <div class="btn btn-primary slide-button"/>
         </label>
 
-        {{#if helpext}}
+        {{#if helpText}}
             <span class="help-inline-checkbox">
                 <i class="icon-question-sign" title="{{helpText}}"/>
             </span>
diff --git a/UI/Series/Delete/DeleteSeriesTemplate.html b/UI/Series/Delete/DeleteSeriesTemplate.html
index 261f822306..ac262f6049 100644
--- a/UI/Series/Delete/DeleteSeriesTemplate.html
+++ b/UI/Series/Delete/DeleteSeriesTemplate.html
@@ -28,7 +28,7 @@
 
                 <span class="help-inline-checkbox">
                     <i class="icon-question-sign" title="Do you want to delete all files from disk?"/>
-                    <i class="icon-nd-form-danger" title="This option is irreversible, use with extreme caution"/>
+                    <i class="icon-nd-form-warning" title="This option is irreversible, use with extreme caution"/>
                 </span>
                     </div>
                 </div>
diff --git a/UI/Settings/DownloadClient/LayoutTemplate.html b/UI/Settings/DownloadClient/LayoutTemplate.html
index d820658770..9d66916f53 100644
--- a/UI/Settings/DownloadClient/LayoutTemplate.html
+++ b/UI/Settings/DownloadClient/LayoutTemplate.html
@@ -20,7 +20,7 @@
             <input type="text" name="downloadedEpisodesFolder" class="x-path"/>
             <span class="help-inline">
                 <i class="icon-form-info" title="The folder where your download client downloads TV shows to (aka TV Download Dir)"/>
-                <i class="icon-nd-form-danger" title="Do not use the folder that contains some or all of your sorted and named TV shows - doing so could cause data loss"></i>
+                <i class="icon-nd-form-warning" title="Do not use the folder that contains some or all of your sorted and named TV shows - doing so could cause data loss"></i>
             </span>
         </div>
     </div>
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index 19f4a84cb0..5c9cf3ebcb 100644
--- a/UI/Settings/General/GeneralTemplate.html
+++ b/UI/Settings/General/GeneralTemplate.html
@@ -8,7 +8,7 @@
             <div class="controls">
                 <input type="number" placeholder="8989" name="port"/>
                     <span>
-                <i class="icon-nd-form-danger" title="Requires restart to take effect"/>
+                <i class="icon-nd-form-warning" title="Requires restart to take effect"/>
             </span>
             </div>
 
@@ -85,7 +85,7 @@
                 </select>
 
                 <span>
-                    <i class="icon-nd-form-danger" title="Trace and Debug logging should only be enabled temporarily"/>
+                    <i class="icon-nd-form-warning" title="Trace and Debug logging should only be enabled temporarily"/>
                 </span>
             </div>
         </div>
diff --git a/UI/Settings/MediaManagement/Naming/ViewTemplate.html b/UI/Settings/MediaManagement/Naming/ViewTemplate.html
index 50b732d1c1..657be7b83b 100644
--- a/UI/Settings/MediaManagement/Naming/ViewTemplate.html
+++ b/UI/Settings/MediaManagement/Naming/ViewTemplate.html
@@ -17,7 +17,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-nd-form-danger" title="NzbDrone will use the existing file name if set to no"/>
+                <i class="icon-nd-form-warning" title="NzbDrone will use the existing file name if set to no"/>
             </span>
         </div>
     </div>