diff --git a/UI/AddSeries/AddSeriesTemplate.html b/UI/AddSeries/AddSeriesTemplate.html
index 9756cd3fd..4128fc220 100644
--- a/UI/AddSeries/AddSeriesTemplate.html
+++ b/UI/AddSeries/AddSeriesTemplate.html
@@ -1,9 +1,9 @@
 <div class="row">
     <div class="input-prepend nz-input-large add-series-search span11">
-        <i class="add-on icon-search"></i>
+        <i class="add-on icon-search"/>
         <input type="text" class="input-block-level x-series-search" placeholder="Start typing the name of series you want to add ...">
     </div>
 </div>
 <div class="row">
     <div id="search-result" class="result-list span12"/>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html b/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
index 1fba79c58..cd94f27f9 100644
--- a/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
+++ b/UI/AddSeries/Existing/UnmappedFolderCompositeViewTemplate.html
@@ -8,7 +8,7 @@
     <div class="row x-search-bar" style="display: none;">
         <div class="folder-header span11">
             <div class="input-prepend">
-                <i class="add-on icon-search"></i>
+                <i class="add-on icon-search"/>
                 <input class="x-txt-search input-xlarge" type="text" value="{{folder.name}}" placeholder="{{folder.name}}">
             </div>
 
@@ -23,4 +23,4 @@
     <div class="text-center new-series-loadmore x-load-more" style="display: none;">
         <i class="icon-angle-down"/> more
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/AddSeries/RootFolders/LayoutTemplate.html b/UI/AddSeries/RootFolders/LayoutTemplate.html
index 1db0790e2..d1bf59723 100644
--- a/UI/AddSeries/RootFolders/LayoutTemplate.html
+++ b/UI/AddSeries/RootFolders/LayoutTemplate.html
@@ -4,7 +4,7 @@
 </div>
 <div class="modal-body">
     <div class="input-prepend input-append x-path">
-        <i class="add-on icon-folder-open"></i>
+        <i class="add-on icon-folder-open"/>
         <input class="input-block-level" type="text" placeholder="Path of the folder to add ...">
         <div class="btn icon-plus btn-success x-add"/>
     </div>
@@ -12,4 +12,4 @@
 </div>
 <div class="modal-footer">
     <button class="btn" data-dismiss="modal">close</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Form/CheckboxTemplate.html b/UI/Form/CheckboxTemplate.html
index 86794e965..90fccacc5 100644
--- a/UI/Form/CheckboxTemplate.html
+++ b/UI/Form/CheckboxTemplate.html
@@ -14,8 +14,8 @@
 
         {{#if helpext}}
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="{{helpText}}"></i>
+                <i class="icon-question-sign" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Form/PasswordTemplate.html b/UI/Form/PasswordTemplate.html
index 077b625fd..18b91a7dc 100644
--- a/UI/Form/PasswordTemplate.html
+++ b/UI/Form/PasswordTemplate.html
@@ -5,8 +5,8 @@
         <input type="password" name="fields.{{order}}.value"/>
         {{#if helpText}}
             <span class="help-inline">
-                <i class="icon-question-sign" title="{{helpText}}"></i>
+                <i class="icon-question-sign" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Form/SelectTemplate.html b/UI/Form/SelectTemplate.html
index f917a5fee..62feb61af 100644
--- a/UI/Form/SelectTemplate.html
+++ b/UI/Form/SelectTemplate.html
@@ -9,8 +9,8 @@
         </select>
         {{#if helpText}}
             <span class="help-inline">
-                <i class="icon-question-sign" title="{{helpText}}"></i>
+                <i class="icon-question-sign" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Form/TextboxTemplate.html b/UI/Form/TextboxTemplate.html
index 9f191cee5..d39f08db8 100644
--- a/UI/Form/TextboxTemplate.html
+++ b/UI/Form/TextboxTemplate.html
@@ -5,7 +5,7 @@
         <input type="text" name="fields.{{order}}.value" spellcheck="false"/>
         {{#if helpText}}
             <span class="help-inline">
-                <i class="icon-question-sign" title="{{helpText}}"></i>
+                <i class="icon-question-sign" title="{{helpText}}"/>
             </span>
         {{/if}}
     </div>
diff --git a/UI/History/ControlsColumnTemplate.html b/UI/History/ControlsColumnTemplate.html
index 2712fb5d5..869b7b965 100644
--- a/UI/History/ControlsColumnTemplate.html
+++ b/UI/History/ControlsColumnTemplate.html
@@ -1,2 +1,2 @@
-<i class="icon-remove x-remove" title="Remove"></i>
-<i class="icon-repeat x-redownload" title="Re-Download"></i>
\ No newline at end of file
+<i class="icon-remove x-remove" title="Remove"/>
+<i class="icon-repeat x-redownload" title="Re-Download"/>
diff --git a/UI/Missing/ControlsColumnTemplate.html b/UI/Missing/ControlsColumnTemplate.html
index 2783a2600..78292bfca 100644
--- a/UI/Missing/ControlsColumnTemplate.html
+++ b/UI/Missing/ControlsColumnTemplate.html
@@ -1 +1 @@
-<i class="icon-search x-search" title="Search"></i>
\ No newline at end of file
+<i class="icon-search x-search" title="Search"/>
diff --git a/UI/Series/Edit/EditSeriesTemplate.html b/UI/Series/Edit/EditSeriesTemplate.html
index 1d96802d0..5903dd35e 100644
--- a/UI/Series/Edit/EditSeriesTemplate.html
+++ b/UI/Series/Edit/EditSeriesTemplate.html
@@ -20,7 +20,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-question-sign" title="Should NzbDrone download episodes for this series?"></i>
+                    <i class="icon-question-sign" title="Should NzbDrone download episodes for this series?"/>
                 </span>
             </div>
         </div>
@@ -40,7 +40,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-question-sign" title="Should downloaded episodes be stored in season folders?"></i>
+                    <i class="icon-question-sign" title="Should downloaded episodes be stored in season folders?"/>
                 </span>
             </div>
         </div>
@@ -56,7 +56,7 @@
                     {{/each}}
                 </select>
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Which Quality Profile should NzbDrone use to download episodes?"></i>
+                    <i class="icon-question-sign" title="Which Quality Profile should NzbDrone use to download episodes?"/>
                 </span>
             </div>
         </div>
@@ -67,7 +67,7 @@
             <div class="controls">
                 <input type="text" id="inputPath" placeholder="Path" name="path">
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Where should NzbDrone store episodes for this series?"></i>
+                    <i class="icon-question-sign" title="Where should NzbDrone store episodes for this series?"/>
                 </span>
             </div>
         </div>
@@ -82,7 +82,7 @@
                     <option value="disable">Disable</option>
                 </select>
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Should NzbDrone search for missing episodes every 30 days?"></i>
+                    <i class="icon-question-sign" title="Should NzbDrone search for missing episodes every 30 days?"/>
                 </span>
             </div>
         </div>
@@ -93,7 +93,7 @@
             <div class="controls">
                 <input type="date" id="inputCustomStartDate" name="customStartDate">
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="Should NzbDrone only download episodes after your preferred start date?"></i>
+                    <i class="icon-question-sign" title="Should NzbDrone only download episodes after your preferred start date?"/>
                 </span>
             </div>
         </div>
@@ -103,4 +103,4 @@
     <button class="btn btn-danger pull-left x-remove">delete</button>
     <button class="btn" data-dismiss="modal">cancel</button>
     <button class="btn btn-primary x-save">save</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Series/Index/List/ItemTemplate.html b/UI/Series/Index/List/ItemTemplate.html
index 7c5c5c39a..a0d064731 100644
--- a/UI/Series/Index/List/ItemTemplate.html
+++ b/UI/Series/Index/List/ItemTemplate.html
@@ -14,8 +14,8 @@
                 </div>
                 <div class="span1">
                     <div class="pull-right">
-                        <i class="icon-cog x-edit" title="Edit Series"></i>
-                        <i class="icon-remove x-remove" title="Delete Series"></i>
+                        <i class="icon-cog x-edit" title="Edit Series"/>
+                        <i class="icon-remove x-remove" title="Delete Series"/>
                     </div>
                 </div>
             </div>
diff --git a/UI/Series/Index/Posters/ItemTemplate.html b/UI/Series/Index/Posters/ItemTemplate.html
index b7d30a454..76155782a 100644
--- a/UI/Series/Index/Posters/ItemTemplate.html
+++ b/UI/Series/Index/Posters/ItemTemplate.html
@@ -4,8 +4,8 @@
             <div class="center">
                 <div class="series-poster-container x-series-poster">
                     <div class="series-controls">
-                        <i class="icon-cog x-edit" title="Edit Series"></i>
-                        <i class="icon-remove x-remove" title="Delete Series"></i>
+                        <i class="icon-cog x-edit" title="Edit Series"/>
+                        <i class="icon-remove x-remove" title="Delete Series"/>
                     </div>
                     {{#unless isContinuing}}
                         <div class="ended-banner">Ended</div>
diff --git a/UI/Series/Index/Table/ControlsColumnTemplate.html b/UI/Series/Index/Table/ControlsColumnTemplate.html
index 48f19e1df..042f6897e 100644
--- a/UI/Series/Index/Table/ControlsColumnTemplate.html
+++ b/UI/Series/Index/Table/ControlsColumnTemplate.html
@@ -1,2 +1,2 @@
-<i class="icon-cog x-edit" title="Edit Series"></i>
-<i class="icon-remove x-remove" title="Delete Series"></i>
\ No newline at end of file
+<i class="icon-cog x-edit" title="Edit Series"/>
+<i class="icon-remove x-remove" title="Delete Series"/>
diff --git a/UI/Settings/DownloadClient/DownloadClientTemplate.html b/UI/Settings/DownloadClient/DownloadClientTemplate.html
index 31eddaf2b..978083aad 100644
--- a/UI/Settings/DownloadClient/DownloadClientTemplate.html
+++ b/UI/Settings/DownloadClient/DownloadClientTemplate.html
@@ -12,7 +12,7 @@
                 <option value="nzbget">NZBGet</option>
             </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="What method do you download NZBs with?"></i>
+                <i class="icon-question-sign" title="What method do you download NZBs with?"/>
             </span>
         </div>
     </div>
@@ -22,7 +22,7 @@
         <div class="controls">
             <input type="text" placeholder="C:\Unsorted TV" name="downloadedEpisodesFolder" class="x-path"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="The folder where your download client downloads TV shows to."></i>
+                <i class="icon-question-sign" title="The folder where your download client downloads TV shows to."/>
             </span>
         </div>
     </div>
@@ -38,7 +38,7 @@
             <input type="button" value="Auto-Configure" class="btn btn-inverse"/>
             <span class="help-inline">
                 <i class="icon-question-sign"
-                        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"></i>
+                        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>
     </div>
@@ -49,7 +49,7 @@
         <div class="controls">
             <input type="text" name="sabHost"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Hostname or IP Address running SABnzbd"></i>
+                <i class="icon-question-sign" title="Hostname or IP Address running SABnzbd"/>
             </span>
         </div>
     </div>
@@ -60,7 +60,7 @@
         <div class="controls">
             <input type="text" name="sabPort"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Port for the SABnzbd Web Interface"></i>
+                <i class="icon-question-sign" title="Port for the SABnzbd Web Interface"/>
             </span>
         </div>
     </div>
@@ -71,7 +71,7 @@
         <div class="controls">
             <input type="text" name="sabApiKey"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="API Key for SABnzbd<br/>Found in Config -> General"></i>
+                <i class="icon-question-sign" title="API Key for SABnzbd<br/>Found in Config -> General"/>
             </span>
         </div>
     </div>
@@ -82,7 +82,7 @@
         <div class="controls">
             <input type="text" name="sabUsername"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Username for the SABnzbd web interface"></i>
+                <i class="icon-question-sign" title="Username for the SABnzbd web interface"/>
             </span>
         </div>
     </div>
@@ -93,7 +93,7 @@
         <div class="controls">
             <input type="password" name="sabPassword"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Password for the SABnzbd web interface"></i>
+                <i class="icon-question-sign" title="Password for the SABnzbd web interface"/>
             </span>
         </div>
     </div>
@@ -104,7 +104,7 @@
         <div class="controls">
             <input type="text" name="sabTvCategory" placeholder="This is not the dropdownlist you're looking for"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Category to use when sending NZBs to SABnzbd"></i>
+                <i class="icon-question-sign" title="Category to use when sending NZBs to SABnzbd"/>
             </span>
         </div>
     </div>
@@ -122,7 +122,7 @@
                 <option value="force">Force</option>
             </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Priority to use when sending episodes older than 7 days to SABnzbd"></i>
+                <i class="icon-question-sign" title="Priority to use when sending episodes older than 7 days to SABnzbd"/>
             </span>
         </div>
     </div>
@@ -140,7 +140,7 @@
                 <option value="force">Force</option>
             </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Priority to use when sending episodes that aired within the last 7 days to SABnzbd"></i>
+                <i class="icon-question-sign" title="Priority to use when sending episodes that aired within the last 7 days to SABnzbd"/>
             </span>
         </div>
     </div>
@@ -151,7 +151,7 @@
         <div class="controls">
             <input type="button" value="Test" class="btn btn-inverse"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Test SABnzbd settings"></i>
+                <i class="icon-question-sign" title="Test SABnzbd settings"/>
             </span>
         </div>
     </div>
@@ -165,7 +165,7 @@
         <div class="controls">
             <input type="text" name="blackholeFolder" class="x-path"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="The folder where your download client will pickup .nzb files"></i>
+                <i class="icon-question-sign" title="The folder where your download client will pickup .nzb files"/>
             </span>
         </div>
     </div>
@@ -179,7 +179,7 @@
         <div class="controls">
             <input type="text" name="pneumaticFolder" class="x-path"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Folder to save NZBs for Pneumatic<br/>must be accessible from XBMC"></i>
+                <i class="icon-question-sign" title="Folder to save NZBs for Pneumatic<br/>must be accessible from XBMC"/>
             </span>
         </div>
     </div>
@@ -193,7 +193,7 @@
         <div class="controls">
             <input type="text" name="nzbgetHost"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Hostname or IP Address running NZBGet"></i>
+                <i class="icon-question-sign" title="Hostname or IP Address running NZBGet"/>
             </span>
         </div>
     </div>
@@ -204,7 +204,7 @@
         <div class="controls">
             <input type="text" name="nzbgetPort"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Port for the NZBGet Web Interface"></i>
+                <i class="icon-question-sign" title="Port for the NZBGet Web Interface"/>
             </span>
         </div>
     </div>
@@ -215,7 +215,7 @@
         <div class="controls">
             <input type="text" name="nzbgetApiKey"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="API Key for NZBGet<br/>Found in Config -> General"></i>
+                <i class="icon-question-sign" title="API Key for NZBGet<br/>Found in Config -> General"/>
             </span>
         </div>
     </div>
@@ -226,7 +226,7 @@
         <div class="controls">
             <input type="text" name="nzbgetUsername"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Username for the NZBGet web interface"></i>
+                <i class="icon-question-sign" title="Username for the NZBGet web interface"/>
             </span>
         </div>
     </div>
@@ -237,7 +237,7 @@
         <div class="controls">
             <input type="password" name="nzbgetPassword"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Password for the NZBGet web interface"></i>
+                <i class="icon-question-sign" title="Password for the NZBGet web interface"/>
             </span>
         </div>
     </div>
@@ -248,7 +248,7 @@
         <div class="controls">
             <input type="text" name="nzbgetTvCategory"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Category to use when sending NZBs to NZBGet"></i>
+                <i class="icon-question-sign" title="Category to use when sending NZBs to NZBGet"/>
             </span>
         </div>
     </div>
@@ -266,7 +266,7 @@
                 <option value="force">Force</option>
             </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Priority to use when sending episodes older than 7 days to NZBGet"></i>
+                <i class="icon-question-sign" title="Priority to use when sending episodes older than 7 days to NZBGet"/>
             </span>
         </div>
     </div>
@@ -284,7 +284,7 @@
                 <option value="force">Force</option>
             </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Priority to use when sending episodes that aired within the last 7 days to NZBGet"></i>
+                <i class="icon-question-sign" title="Priority to use when sending episodes that aired within the last 7 days to NZBGet"/>
             </span>
         </div>
     </div>
@@ -295,7 +295,7 @@
         <div class="controls">
             <input type="button" value="Test" class="btn btn-inverse"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="Test NZBGet settings"></i>
+                <i class="icon-question-sign" title="Test NZBGet settings"/>
             </span>
         </div>
     </div>
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index 2a959f841..ea5285ad5 100644
--- a/UI/Settings/General/GeneralTemplate.html
+++ b/UI/Settings/General/GeneralTemplate.html
@@ -8,7 +8,7 @@
             <div class="controls">
                 <input type="text" placeholder="8989" name="port"/>
                     <span>
-                <i class="icon-exclamation-sign danger" title="Requires restart to take effect"></i>
+                <i class="icon-exclamation-sign danger" title="Requires restart to take effect"/>
             </span>
             </div>
 
@@ -30,7 +30,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Open a web browser and navigate to NzbDrone homepage on app start. Has no effect if installed as a windows service"></i>
+                <i class="icon-question-sign" title="Open a web browser and navigate to NzbDrone homepage on app start. Has no effect if installed as a windows service"/>
             </span>
             </div>
         </div>
@@ -67,4 +67,4 @@
 
 
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/Misc/MiscTemplate.html b/UI/Settings/Misc/MiscTemplate.html
index d96e7cac0..7de970152 100644
--- a/UI/Settings/Misc/MiscTemplate.html
+++ b/UI/Settings/Misc/MiscTemplate.html
@@ -16,9 +16,9 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should NzbDrone try to download missing episodes automatically?"></i>
+                <i class="icon-question-sign" title="Should NzbDrone try to download missing episodes automatically?"/>
                 <i class="icon-exclamation-sign danger" title="Enabling backlog searching can use a lot of bandwidth and is not
-                                                     recommended for users with block usenet accounts or bandwidth restrictions."></i>
+                                                     recommended for users with block usenet accounts or bandwidth restrictions."/>
             </span>
         </div>
     </div>
@@ -38,7 +38,7 @@
             </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Episodes deleted from disk are automatically ignored in NzbDrone"></i>
+                <i class="icon-question-sign" title="Episodes deleted from disk are automatically ignored in NzbDrone"/>
             </span>
         </div>
     </div>
@@ -49,9 +49,9 @@
         <div class="controls">
             <textarea rows="3" name="nzbRestrictions" class="nzb-restrictions"></textarea>
             <span class="help-inline">
-                <i class="icon-question-sign" title="White list or black list nzbs based on these rules<br/>White list: +:LoL<br/>Black list: -:French"></i>
+                <i class="icon-question-sign" title="White list or black list nzbs based on these rules<br/>White list: +:LoL<br/>Black list: -:French"/>
             </span>
             <span class="text-area-help">Newline-delimited set of rules in the form of +|-:</span>
         </div>
     </div>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/UI/Settings/Naming/NamingTemplate.html b/UI/Settings/Naming/NamingTemplate.html
index 8d643a859..5fdc366f6 100644
--- a/UI/Settings/Naming/NamingTemplate.html
+++ b/UI/Settings/Naming/NamingTemplate.html
@@ -18,7 +18,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Use the scene name, ignoring all other naming settings"></i>
+                <i class="icon-question-sign" title="Use the scene name, ignoring all other naming settings"/>
             </span>
             </div>
         </div>
@@ -39,7 +39,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should filenames contain the series name when renamed?"></i>
+                <i class="icon-question-sign" title="Should filenames contain the series name when renamed?"/>
             </span>
             </div>
         </div>
@@ -60,7 +60,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should filenames contain the episode name when renamed?"></i>
+                <i class="icon-question-sign" title="Should filenames contain the episode name when renamed?"/>
             </span>
             </div>
         </div>
@@ -81,7 +81,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Should filenames have the include the quality?"></i>
+                <i class="icon-question-sign" title="Should filenames have the include the quality?"/>
             </span>
             </div>
         </div>
@@ -102,7 +102,7 @@
                 </label>
 
             <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Do you want to replace spaces in the filename with periods?"></i>
+                <i class="icon-question-sign" title="Do you want to replace spaces in the filename with periods?"/>
             </span>
             </div>
         </div>
@@ -113,7 +113,7 @@
             <div class="controls">
                 <input type="text" placeholder="Season %s" name="seasonFolderFormat"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="How should season folders be named? (Use %0s to pad to two digits)"></i>
+                <i class="icon-question-sign" title="How should season folders be named? (Use %0s to pad to two digits)"/>
             </span>
             </div>
         </div>
@@ -128,7 +128,7 @@
                     <option value=".">Period</option>
                 </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="How should NzbDrone separate sections of the filename?"></i>
+                <i class="icon-question-sign" title="How should NzbDrone separate sections of the filename?"/>
             </span>
             </div>
         </div>
@@ -144,7 +144,7 @@
                     <option value="3">s01e05</option>
                 </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="What numbering style do you want?"></i>
+                <i class="icon-question-sign" title="What numbering style do you want?"/>
             </span>
             </div>
         </div>
@@ -160,9 +160,9 @@
                     <option value="3">Scene</option>
                 </select>
             <span class="help-inline">
-                <i class="icon-question-sign" title="How will multi-episode files be named?"></i>
+                <i class="icon-question-sign" title="How will multi-episode files be named?"/>
             </span>
             </div>
         </div>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/Notifications/EditTemplate.html b/UI/Settings/Notifications/EditTemplate.html
index 09ecc5411..f8992d075 100644
--- a/UI/Settings/Notifications/EditTemplate.html
+++ b/UI/Settings/Notifications/EditTemplate.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>
+                <i class="icon-question-sign" 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>
+                <i class="icon-question-sign" title="Do you want to get notifications when episodes are downloaded?"/>
             </span>
             </div>
         </div>
@@ -68,4 +68,4 @@
 
     <button class="btn" data-dismiss="modal">cancel</button>
     <button class="btn btn-primary x-save">save</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/UI/Settings/Notifications/ItemTemplate.html b/UI/Settings/Notifications/ItemTemplate.html
index a94dc230b..2b8eb04a5 100644
--- a/UI/Settings/Notifications/ItemTemplate.html
+++ b/UI/Settings/Notifications/ItemTemplate.html
@@ -4,6 +4,6 @@
 <td name="onDownload"></td>
 <td name="cutoff.name"></td>
 <td>
-    <i class="icon-cog x-edit" title="Edit"></i>
-    <i class="icon-remove x-delete" title="Delete"></i>
+    <i class="icon-cog x-edit" title="Edit"/>
+    <i class="icon-remove x-delete" title="Delete"/>
 </td>
diff --git a/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html b/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
index e393b4624..2a7f9bd20 100644
--- a/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
+++ b/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
@@ -9,7 +9,7 @@
             <div class="controls">
                 <input type="text" name="name">
                 <span class="help-inline">
-                    <i class="icon-question-sign" title="The name for this quality profile"></i>
+                    <i class="icon-question-sign" title="The name for this quality profile"/>
                 </span>
             </div>
         </div>
@@ -22,7 +22,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>
+                    <i class="icon-question-sign" title="Once this quality is reached NzbDrone will no longer download episodes"/>
                 </span>
             </div>
         </div>
diff --git a/UI/Settings/Quality/Profile/QualityProfileTemplate.html b/UI/Settings/Quality/Profile/QualityProfileTemplate.html
index c73eec5aa..1887ab583 100644
--- a/UI/Settings/Quality/Profile/QualityProfileTemplate.html
+++ b/UI/Settings/Quality/Profile/QualityProfileTemplate.html
@@ -6,6 +6,6 @@
 </td>
 <td name="cutoff.name"></td>
 <td>
-    <i class="icon-cog x-edit" title="Edit Series"></i>
+    <i class="icon-cog x-edit" title="Edit Series"/>
     | Delete
 </td>
diff --git a/UI/Shared/Grid/PagerTemplate.html b/UI/Shared/Grid/PagerTemplate.html
index 40a21f3e2..c86a3a50c 100644
--- a/UI/Shared/Grid/PagerTemplate.html
+++ b/UI/Shared/Grid/PagerTemplate.html
@@ -4,7 +4,7 @@
             {{#if pageNumber}}
                 <span>{{label}}</span>
             {{else}}
-            <i class="pager-btn clickable {{label}}" data-action="{{action}}"></i>
+            <i class="pager-btn clickable {{label}}" data-action="{{action}}"/>
             {{/if}}
         </li>
     {{/each}}
diff --git a/UI/Shared/SpinnerTemplate.html b/UI/Shared/SpinnerTemplate.html
index 43c430f33..ab1bf0b60 100644
--- a/UI/Shared/SpinnerTemplate.html
+++ b/UI/Shared/SpinnerTemplate.html
@@ -1 +1 @@
-<i class="icon-spinner icon-spin"></i>
\ No newline at end of file
+<i class="icon-spinner icon-spin"/>