diff --git a/src/3p-filters.html b/src/3p-filters.html
index 3a2157d07..5a79a83fb 100644
--- a/src/3p-filters.html
+++ b/src/3p-filters.html
@@ -46,10 +46,10 @@
     </div>
     <div class="li listEntry">
         <label><input type="checkbox"><span><span class="listname forinput"></span> <span class="iconbar"><!--
-     --><a class="fa-icon content" href="" type="text/plain" target="_blank" data-i18n-title="3pViewContent">eye-open</a><!--
-     --><a class="fa-icon support" href="" target="_blank">home</a><!--
-     --><span class="fa-icon remove" href="">trash-o</span><!--
-     --><a class="fa-icon mustread" href="" target="_blank">info-circle</a><!--
+     --><a class="fa-icon content" href="#" type="text/plain" target="_blank" data-i18n-title="3pViewContent">eye-open</a><!--
+     --><a class="fa-icon support" href="#" target="_blank">home</a><!--
+     --><span class="fa-icon remove">trash-o</span><!--
+     --><a class="fa-icon mustread" href="#" target="_blank">info-circle</a><!--
      --><span class="fa-icon status unsecure" title="http">unlock-alt</span><!--
      --><span class="fa-icon status obsolete" data-i18n-title="3pExternalListObsolete">exclamation-triangle</span><!--
      --><span class="fa-icon status cache">clock-o</span><!--
diff --git a/src/document-blocked.html b/src/document-blocked.html
index 90d39a1a2..f54347463 100644
--- a/src/document-blocked.html
+++ b/src/document-blocked.html
@@ -52,7 +52,7 @@
     <span class="filterList">
         <span class="filterListSeparator">&#x2022;</span>
         <a class="filterListSource" href="asset-viewer.html?url=" target="_blank"></a>&nbsp;<!--
-     --><a class="fa filterListSupport" href="" target="_blank">&#xf015;</a>
+     --><a class="fa filterListSupport" href="#" target="_blank">&#xf015;</a>
     </span>
 </div>
 
diff --git a/src/settings.html b/src/settings.html
index 587900ef8..c4e0e8ec2 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -16,7 +16,7 @@
     <div class="li"><label><input type="checkbox" data-setting-name="collapseBlocked" data-setting-type="bool"><span data-i18n="settingsCollapseBlockedPrompt"></span></label></div>
     <div class="li"><label><input type="checkbox" data-setting-name="showIconBadge" data-setting-type="bool"><span data-i18n="settingsIconBadgePrompt"></span></label></div>
     <div class="li"><label><input type="checkbox" data-setting-name="contextMenuEnabled" data-setting-type="bool"><span data-i18n="settingsContextMenuPrompt"></span></label></div>
-    <div class="li"><label><input type="checkbox" data-setting-name="tooltipsDisabled" data-setting-type="bool"><span data-i18n="settingsTooltipsPrompt"><span></label></div>
+    <div class="li"><label><input type="checkbox" data-setting-name="tooltipsDisabled" data-setting-type="bool"><span data-i18n="settingsTooltipsPrompt"></span></label></div>
     <div class="li"><label><input type="checkbox" data-setting-name="colorBlindFriendly" data-setting-type="bool"><span data-i18n="settingsColorBlindPrompt"></span></label></div>
     <div class="li"><label><input type="checkbox" data-setting-name="cloudStorageEnabled" data-setting-type="bool"><span><span data-i18n="settingsCloudStorageEnabledPrompt"></span>&nbsp;<a class="fa-icon info" href="https://github.com/gorhill/uBlock/wiki/Cloud-storage" target="_blank">info-circle</a></span></label></div>
     <div class="li"><label><input type="checkbox" data-setting-name="advancedUserEnabled" data-setting-type="bool"><span><span data-i18n="settingsAdvancedUserPrompt"></span>&nbsp;<a class="fa-icon info" href="advanced-settings.html" data-i18n-title="settingsAdvancedUserSettings">cogs</a></span></label></div>
diff --git a/src/shortcuts.html b/src/shortcuts.html
index 7fa07b352..be24b7d96 100644
--- a/src/shortcuts.html
+++ b/src/shortcuts.html
@@ -22,8 +22,8 @@
             <td class="commandDesc">
             <td class="commandShortcut">
                 <input type="text" placeholder="shortcutCapturePlaceholder">
-                <button class="commandReset" type="button">&times;</button>
-    </div>
+                <button class="commandReset vflex" type="button">&times;</button>
+    </table>
 </div>
 
 <script src="js/vapi.js"></script>