diff --git a/UI/Content/icons.less b/UI/Content/icons.less
index 7ccfb932e..efcb632d2 100644
--- a/UI/Content/icons.less
+++ b/UI/Content/icons.less
@@ -68,16 +68,16 @@
   .icon(@plus);
 }
 
-.icon-form-info:before {
+.icon-nd-form-info:before {
   .icon(@question-sign);
 }
 
-.icon-form-warning:before {
+.icon-nd-form-warning:before {
   .icon(@warning-sign);
   color: #f89406;
 }
 
-.icon-form-danger:before {
+.icon-nd-form-danger:before {
   .icon(@exclamation-sign);
   color: #b94a48;
 }
@@ -85,4 +85,8 @@
 .icon-nd-donate:before {
   .icon(@heart);
   color: @nzbdroneRed;
+}
+
+.icon-nd-update:before {
+  .icon(@download-alt);
 }
\ No newline at end of file
diff --git a/UI/Series/Delete/DeleteSeriesTemplate.html b/UI/Series/Delete/DeleteSeriesTemplate.html
index 6fe7f9a38..98d905977 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-form-danger" title="This option is irreversible, use with extreme caution"/>
+                    <i class="icon-nd-form-danger" 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 d8579edca..d82065877 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-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-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>
             </span>
         </div>
     </div>
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index 6325f37c1..19f4a84cb 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-form-danger" title="Requires restart to take effect"/>
+                <i class="icon-nd-form-danger" title="Requires restart to take effect"/>
             </span>
             </div>
 
@@ -85,7 +85,7 @@
                 </select>
 
                 <span>
-                    <i class="icon-form-danger" title="Trace and Debug logging should only be enabled temporarily"/>
+                    <i class="icon-nd-form-danger" title="Trace and Debug logging should only be enabled temporarily"/>
                 </span>
             </div>
         </div>
diff --git a/UI/Settings/Indexers/Options/ViewTemplate.html b/UI/Settings/Indexers/Options/ViewTemplate.html
index 7c5ea1238..1830fd4b2 100644
--- a/UI/Settings/Indexers/Options/ViewTemplate.html
+++ b/UI/Settings/Indexers/Options/ViewTemplate.html
@@ -16,7 +16,7 @@
             <input type="number" min="10" max="120" name="rssSyncInterval"/>
 
             <span class="help-inline">
-                <i class="icon-form-warning" title="This will apply to all indexers, please follow the rules set forth by them"/>
+                <i class="icon-nd-form-warning" title="This will apply to all indexers, please follow the rules set forth by them"/>
             </span>
         </div>
     </div>
diff --git a/UI/Settings/MediaManagement/Naming/ViewTemplate.html b/UI/Settings/MediaManagement/Naming/ViewTemplate.html
index 21bfa9861..58b530f62 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-form-danger" title="NzbDrone will use the existing file name if set to no"/>
+                <i class="icon-nd-form-danger" title="NzbDrone will use the existing file name if set to no"/>
             </span>
         </div>
     </div>
diff --git a/UI/System/Layout.js b/UI/System/Layout.js
index 5c1b06464..f1d499dc1 100644
--- a/UI/System/Layout.js
+++ b/UI/System/Layout.js
@@ -35,8 +35,8 @@ define(
                             route: 'logs'
                         },
                         {
-                            title: 'Check for Update',
-                            icon: 'icon-download-alt',
+                            title  : 'Check for Update',
+                            icon   : 'icon-nd-update',
                             command: 'applicationUpdate'
                         },
 //                        {