diff --git a/src/UI/Form/CheckboxTemplate.html b/src/UI/Form/CheckboxTemplate.html
index 94c7dde4c..68a6fdb26 100644
--- a/src/UI/Form/CheckboxTemplate.html
+++ b/src/UI/Form/CheckboxTemplate.html
@@ -14,7 +14,7 @@
 
         {{#if helpText}}
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="{{helpText}}"/>
+                <i class="icon-nd-form-info" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
diff --git a/src/UI/Form/FormHelpPartial.html b/src/UI/Form/FormHelpPartial.html
index cdf295852..53a2a495b 100644
--- a/src/UI/Form/FormHelpPartial.html
+++ b/src/UI/Form/FormHelpPartial.html
@@ -1,6 +1,6 @@
 {{#if helpText}}
     <span class="help-inline">
-        <i class="icon-question-sign" title="{{helpText}}"/>
+        <i class="icon-nd-form-info" title="{{helpText}}"/>
     </span>
 {{/if}}
 
diff --git a/src/UI/Form/PasswordTemplate.html b/src/UI/Form/PasswordTemplate.html
index 9f8c4a9a0..c03abbaed 100644
--- a/src/UI/Form/PasswordTemplate.html
+++ b/src/UI/Form/PasswordTemplate.html
@@ -5,7 +5,7 @@
         <input type="password" name="fields.{{order}}.value" validation-name="{{name}}"/>
         {{#if helpText}}
             <span class="help-inline">
-                <i class="icon-question-sign" title="{{helpText}}"/>
+                <i class="icon-nd-form-info" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
diff --git a/src/UI/Form/SelectTemplate.html b/src/UI/Form/SelectTemplate.html
index 62feb61af..89e5065ce 100644
--- a/src/UI/Form/SelectTemplate.html
+++ b/src/UI/Form/SelectTemplate.html
@@ -9,7 +9,7 @@
         </select>
         {{#if helpText}}
             <span class="help-inline">
-                <i class="icon-question-sign" title="{{helpText}}"/>
+                <i class="icon-nd-form-info" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
diff --git a/src/UI/SeasonPass/SeriesLayoutTemplate.html b/src/UI/SeasonPass/SeriesLayoutTemplate.html
index 8601d6453..be084a498 100644
--- a/src/UI/SeasonPass/SeriesLayoutTemplate.html
+++ b/src/UI/SeasonPass/SeriesLayoutTemplate.html
@@ -22,7 +22,7 @@
                 </select>
 
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Selecting a season will unmonitor all previous seasons"/>
+                    <i class="icon-nd-form-info" title="Selecting a season will unmonitor all previous seasons"/>
                 </span>
             </span>
 
diff --git a/src/UI/Series/Delete/DeleteSeriesTemplate.html b/src/UI/Series/Delete/DeleteSeriesTemplate.html
index ac262f604..e54fc750d 100644
--- a/src/UI/Series/Delete/DeleteSeriesTemplate.html
+++ b/src/UI/Series/Delete/DeleteSeriesTemplate.html
@@ -27,7 +27,7 @@
                         </label>
 
                 <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-info" title="Do you want to delete all files from disk?"/>
                     <i class="icon-nd-form-warning" title="This option is irreversible, use with extreme caution"/>
                 </span>
                     </div>
diff --git a/src/UI/Series/Edit/EditSeriesViewTemplate.html b/src/UI/Series/Edit/EditSeriesViewTemplate.html
index 7fe6660b9..4476abad0 100644
--- a/src/UI/Series/Edit/EditSeriesViewTemplate.html
+++ b/src/UI/Series/Edit/EditSeriesViewTemplate.html
@@ -26,7 +26,7 @@
                         </label>
 
                         <span class="help-inline-checkbox">
-                            <i class="icon-question-sign" title="Should NzbDrone download episodes for this series?"/>
+                            <i class="icon-nd-form-info" title="Should NzbDrone download episodes for this series?"/>
                         </span>
                     </div>
                 </div>
@@ -46,7 +46,7 @@
                         </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-question-sign" title="Should downloaded episodes be stored in season folders?"/>
+                    <i class="icon-nd-form-info" title="Should downloaded episodes be stored in season folders?"/>
                 </span>
                     </div>
                 </div>
@@ -62,7 +62,7 @@
                             {{/each}}
                         </select>
                     <span class="help-inline">
-                        <i class="icon-question-sign" title="Which Quality Profile should NzbDrone use to download episodes?"/>
+                        <i class="icon-nd-form-info" title="Which Quality Profile should NzbDrone use to download episodes?"/>
                     </span>
                     </div>
                 </div>
@@ -73,7 +73,7 @@
                     <div class="controls">
                         <input type="text" id="inputPath" class="x-path" placeholder="Path" name="path">
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Where should NzbDrone store episodes for this series?"/>
+                    <i class="icon-nd-form-info" title="Where should NzbDrone store episodes for this series?"/>
                 </span>
                     </div>
                 </div>
diff --git a/src/UI/Settings/DownloadClient/SabViewTemplate.html b/src/UI/Settings/DownloadClient/SabViewTemplate.html
index 39e194aa0..9b997ae07 100644
--- a/src/UI/Settings/DownloadClient/SabViewTemplate.html
+++ b/src/UI/Settings/DownloadClient/SabViewTemplate.html
@@ -7,7 +7,7 @@
         <div class="controls">
             <input type="button" value="Auto-Configure" class="btn btn-inverse"/>
             <span class="help-inline">
-                <i class="icon-question-sign"
+                <i class="icon-nd-form-info"
                         title="(Windows only) If access to SABnzbd doesn't require a username & password and it is on the same system as NzbDrone, you can auto-configure it"/>
             </span>
         </div>
diff --git a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
index 616a66f76..3dd1338e1 100644
--- a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
+++ b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.html
@@ -28,7 +28,7 @@
             <textarea rows="3" name="releaseRestrictions" class="release-restrictions"></textarea>
 
             <span class="help-inline">
-                <i class="icon-question-sign" title="Blacklist NZBs based on these words (case-insensitive)"/>
+                <i class="icon-nd-form-info" title="Blacklist NZBs based on these words (case-insensitive)"/>
             </span>
 
             <span class="text-area-help">Newline-delimited set of rules</span>
diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
index ae02dc6a5..a150cee6e 100644
--- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
@@ -16,7 +16,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Episodes deleted from disk are automatically unmonitored in NzbDrone"/>
+                <i class="icon-nd-form-info" title="Episodes deleted from disk are automatically unmonitored in NzbDrone"/>
             </span>
         </div>
     </div>
@@ -36,7 +36,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should NzbDrone automatically upgrade to propers when available?"/>
+                <i class="icon-nd-form-info" title="Should NzbDrone automatically upgrade to propers when available?"/>
             </span>
         </div>
     </div>
@@ -71,7 +71,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Process failed downloads and blacklist the release"/>
+                <i class="icon-nd-form-info" title="Process failed downloads and blacklist the release"/>
             </span>
         </div>
     </div>
@@ -92,7 +92,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-question-sign" title="Automatically search for and attempt to download another release when a download fails?"/>
+                    <i class="icon-nd-form-info" title="Automatically search for and attempt to download another release when a download fails?"/>
                 </span>
             </div>
         </div>
@@ -112,7 +112,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-question-sign" title="Automatically remove failed downloads from history and encrypted downloads from queue?"/>
+                    <i class="icon-nd-form-info" title="Automatically remove failed downloads from history and encrypted downloads from queue?"/>
                 </span>
             </div>
         </div>
diff --git a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
index 74cef9c4d..ca0a685a7 100644
--- a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
@@ -1,4 +1,4 @@
-{{#if_linux}}
+{{#if_linux}}
 <fieldset class="advanced-setting">
     <legend>Permissions</legend>
 
@@ -17,7 +17,8 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should chmod/chown be run when files are imported/renamed?"/>
+                <i class="icon-nd-form-info" title="Should chmod/chown be run when files are imported/renamed?"/>
+                <i class="icon-nd-form-warning" title="If you're unsure what these settings do, do not alter them."/>
             </span>
         </div>
     </div>
@@ -66,4 +67,4 @@
         </div>
     </div>
 </fieldset>
-{{/if_linux}}
\ No newline at end of file
+{{/if_linux}}
\ No newline at end of file
diff --git a/src/UI/Settings/MediaManagement/Sorting/ViewTemplate.html b/src/UI/Settings/MediaManagement/Sorting/ViewTemplate.html
index dde9a2d84..76f25867a 100644
--- a/src/UI/Settings/MediaManagement/Sorting/ViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/Sorting/ViewTemplate.html
@@ -17,7 +17,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Create missing series folders during disk scan"/>
+                <i class="icon-nd-form-info" title="Create missing series folders during disk scan"/>
             </span>
         </div>
     </div>
diff --git a/src/UI/Settings/Notifications/NotificationEditViewTemplate.html b/src/UI/Settings/Notifications/NotificationEditViewTemplate.html
index 9c1fff961..c785fe9c1 100644
--- a/src/UI/Settings/Notifications/NotificationEditViewTemplate.html
+++ b/src/UI/Settings/Notifications/NotificationEditViewTemplate.html
@@ -31,7 +31,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Do you want to get notifications when episodes are grabbed?"/>
+                <i class="icon-nd-form-info" title="Do you want to get notifications when episodes are grabbed?"/>
             </span>
             </div>
         </div>
@@ -51,7 +51,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Do you want to get notifications when episodes are downloaded?"/>
+                <i class="icon-nd-form-info" title="Do you want to get notifications when episodes are downloaded?"/>
             </span>
             </div>
         </div>
diff --git a/src/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html b/src/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
index f45c97dda..5f65e44b5 100644
--- a/src/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
+++ b/src/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
@@ -23,7 +23,7 @@
                     {{/each}}
                 </select>
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Once this quality is reached NzbDrone will no longer download episodes"/>
+                    <i class="icon-nd-form-info" title="Once this quality is reached NzbDrone will no longer download episodes"/>
                 </span>
             </div>
         </div>