diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index ef8f866e2a4..3b378529164 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -55,52 +55,52 @@ <h1 class="applicationTitle">qBittorrent Web User Interface <span class="version
                     <li>
                         <a class="returnFalse qbt-translatable" data-i18n="File">File</a>
                         <ul>
-                            <li><a id="uploadLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Add Torrent File..." alt="Add Torrent File..." src="images/list-add.svg" width="16" height="16" / data-i18n="Add Torrent File...">Add Torrent File...</a></li>
-                            <li><a id="downloadLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Add Torrent Link..." alt="Add Torrent Link..." src="images/insert-link.svg" width="16" height="16" / data-i18n="Add Torrent Link...">Add Torrent Link...</a></li>
-                            <li class="divider qbt-translatable qbt-translatable"><a id="logoutLink"><img class="MyMenuIcon" data-i18n="[alt]Logout" alt="Logout" src="images/system-log-out.svg" width="16" height="16" / data-i18n="Logout">Logout</a></li>
-                            <li><a id="shutdownLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Exit qBittorrent" alt="Exit qBittorrent" src="images/application-exit.svg" width="16" height="16" / data-i18n="Exit qBittorrent">Exit qBittorrent</a></li>
+                            <li><a id="uploadLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Add Torrent File..." alt="Add Torrent File..." src="images/list-add.svg" width="16" height="16" / data-i18n="Add Torrent File...">Add Torrent File...</a></li>
+                            <li><a id="downloadLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Add Torrent Link..." alt="Add Torrent Link..." src="images/insert-link.svg" width="16" height="16" / data-i18n="Add Torrent Link...">Add Torrent Link...</a></li>
+                            <li class="divider qbt-translatable"><a id="logoutLink"><img class="MyMenuIcon" data-i18n="[alt]Logout" alt="Logout" src="images/system-log-out.svg" width="16" height="16" / data-i18n="Logout">Logout</a></li>
+                            <li><a id="shutdownLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Exit qBittorrent" alt="Exit qBittorrent" src="images/application-exit.svg" width="16" height="16" / data-i18n="Exit qBittorrent">Exit qBittorrent</a></li>
                         </ul>
                     </li>
                     <li>
                         <a class="returnFalse qbt-translatable" data-i18n="Edit">Edit</a>
                         <ul>
-                            <li><a id="resumeLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Resume" alt="Resume" src="images/torrent-start.svg" width="16" height="16" / data-i18n="Resume">Resume</a></li>
-                            <li><a id="pauseLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/torrent-stop.svg" data-i18n="[alt]Pause" alt="Pause" width="16" height="16" / data-i18n="Pause">Pause</a></li>
-                            <li><a id="resumeAllLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Resume All" alt="Resume All" src="images/torrent-start.svg" width="16" height="16" / data-i18n="Resume All">Resume All</a></li>
-                            <li><a id="pauseAllLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" data-i18n="[alt]Pause All" alt="Pause All" src="images/torrent-stop.svg" width="16" height="16" / data-i18n="Pause All">Pause All</a></li>
-                            <li class="divider qbt-translatable qbt-translatable"><a id="deleteLink"><img class="MyMenuIcon" src="images/list-remove.svg" data-i18n="[alt]Remove" alt="Remove" width="16" height="16" / data-i18n="Remove">Remove</a></li>
-                            <li id="topQueuePosItem" class="divider qbt-translatable qbt-translatable"><a id="topPrioLink"><img class="MyMenuIcon" src="images/go-top.svg" data-i18n="[alt]Top of Queue" alt="Top of Queue" width="16" height="16" / data-i18n="Top of Queue">Top of Queue</a></li>
-                            <li id="increaseQueuePosItem"><a id="increasePrioLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/go-up.svg" data-i18n="[alt]Move Up Queue" alt="Move Up Queue" width="16" height="16" / data-i18n="Move Up Queue">Move Up Queue</a></li>
-                            <li id="decreaseQueuePosItem"><a id="decreasePrioLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/go-down.svg" data-i18n="[alt]Move Down Queue" alt="Move Down Queue" width="16" height="16" / data-i18n="Move Down Queue">Move Down Queue</a></li>
-                            <li id="bottomQueuePosItem"><a id="bottomPrioLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/go-bottom.svg" data-i18n="[alt]Bottom of Queue" alt="Bottom of Queue" width="16" height="16" / data-i18n="Bottom of Queue">Bottom of Queue</a></li>
+                            <li><a id="resumeLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Resume" alt="Resume" src="images/torrent-start.svg" width="16" height="16" / data-i18n="Resume">Resume</a></li>
+                            <li><a id="pauseLink"><img class="MyMenuIcon qbt-translatable" src="images/torrent-stop.svg" data-i18n="[alt]Pause" alt="Pause" width="16" height="16" / data-i18n="Pause">Pause</a></li>
+                            <li><a id="resumeAllLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Resume All" alt="Resume All" src="images/torrent-start.svg" width="16" height="16" / data-i18n="Resume All">Resume All</a></li>
+                            <li><a id="pauseAllLink"><img class="MyMenuIcon qbt-translatable" data-i18n="[alt]Pause All" alt="Pause All" src="images/torrent-stop.svg" width="16" height="16" / data-i18n="Pause All">Pause All</a></li>
+                            <li class="divider qbt-translatable"><a id="deleteLink"><img class="MyMenuIcon" src="images/list-remove.svg" data-i18n="[alt]Remove" alt="Remove" width="16" height="16" / data-i18n="Remove">Remove</a></li>
+                            <li id="topQueuePosItem" class="divider qbt-translatable"><a id="topPrioLink"><img class="MyMenuIcon" src="images/go-top.svg" data-i18n="[alt]Top of Queue" alt="Top of Queue" width="16" height="16" / data-i18n="Top of Queue">Top of Queue</a></li>
+                            <li id="increaseQueuePosItem"><a id="increasePrioLink"><img class="MyMenuIcon qbt-translatable" src="images/go-up.svg" data-i18n="[alt]Move Up Queue" alt="Move Up Queue" width="16" height="16" / data-i18n="Move Up Queue">Move Up Queue</a></li>
+                            <li id="decreaseQueuePosItem"><a id="decreasePrioLink"><img class="MyMenuIcon qbt-translatable" src="images/go-down.svg" data-i18n="[alt]Move Down Queue" alt="Move Down Queue" width="16" height="16" / data-i18n="Move Down Queue">Move Down Queue</a></li>
+                            <li id="bottomQueuePosItem"><a id="bottomPrioLink"><img class="MyMenuIcon qbt-translatable" src="images/go-bottom.svg" data-i18n="[alt]Bottom of Queue" alt="Bottom of Queue" width="16" height="16" / data-i18n="Bottom of Queue">Bottom of Queue</a></li>
                         </ul>
                     </li>
                     <li>
                         <a class="returnFalse qbt-translatable" data-i18n="View">View</a>
                         <ul>
-                            <li><a id="showTopToolbarLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Top Toolbar" alt="Top Toolbar" width="16" height="16" / data-i18n="Top Toolbar">Top Toolbar</a></li>
-                            <li><a id="showStatusBarLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Status Bar" alt="Status Bar" width="16" height="16" / data-i18n="Status Bar">Status Bar</a></li>
-                            <li><a id="showFiltersSidebarLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Filters Sidebar" alt="Filters Sidebar" width="16" height="16" / data-i18n="Filters Sidebar">Filters Sidebar</a></li>
-                            <li><a id="speedInBrowserTitleBarLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Speed in Title Bar" alt="Speed in Title Bar" width="16" height="16" / data-i18n="Speed in Title Bar">Speed in Title Bar</a></li>
-                            <li class="divider qbt-translatable qbt-translatable"><a id="showSearchEngineLink"><img class="MyMenuIcon" src="images/checked-completed.svg" data-i18n="[alt]Search Engine" alt="Search Engine" width="16" height="16" / data-i18n="Search Engine">Search Engine</a></li>
-                            <li><a id="showRssReaderLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]RSS" alt="RSS" width="16" height="16" / data-i18n="RSS Reader">RSS Reader</a></li>
-                            <li><a id="showLogViewerLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Log" alt="Log" width="16" height="16" / data-i18n="Log">Log</a></li>
-                            <li class="divider qbt-translatable qbt-translatable"><a id="StatisticsLink"><img class="MyMenuIcon" src="images/view-statistics.svg" data-i18n="[alt]Statistics" alt="Statistics" width="16" height="16" / data-i18n="Statistics">Statistics</a></li>
+                            <li><a id="showTopToolbarLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Top Toolbar" alt="Top Toolbar" width="16" height="16" / data-i18n="Top Toolbar">Top Toolbar</a></li>
+                            <li><a id="showStatusBarLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Status Bar" alt="Status Bar" width="16" height="16" / data-i18n="Status Bar">Status Bar</a></li>
+                            <li><a id="showFiltersSidebarLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Filters Sidebar" alt="Filters Sidebar" width="16" height="16" / data-i18n="Filters Sidebar">Filters Sidebar</a></li>
+                            <li><a id="speedInBrowserTitleBarLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Speed in Title Bar" alt="Speed in Title Bar" width="16" height="16" / data-i18n="Speed in Title Bar">Speed in Title Bar</a></li>
+                            <li class="divider qbt-translatable"><a id="showSearchEngineLink"><img class="MyMenuIcon" src="images/checked-completed.svg" data-i18n="[alt]Search Engine" alt="Search Engine" width="16" height="16" / data-i18n="Search Engine">Search Engine</a></li>
+                            <li><a id="showRssReaderLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]RSS" alt="RSS" width="16" height="16" / data-i18n="RSS Reader">RSS Reader</a></li>
+                            <li><a id="showLogViewerLink"><img class="MyMenuIcon qbt-translatable" src="images/checked-completed.svg" data-i18n="[alt]Log" alt="Log" width="16" height="16" / data-i18n="Log">Log</a></li>
+                            <li class="divider qbt-translatable"><a id="StatisticsLink"><img class="MyMenuIcon" src="images/view-statistics.svg" data-i18n="[alt]Statistics" alt="Statistics" width="16" height="16" / data-i18n="Statistics">Statistics</a></li>
                         </ul>
                     </li>
                     <li>
                         <a class="returnFalse qbt-translatable" data-i18n="Tools">Tools</a>
                         <ul>
-                            <li><a id="preferencesLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/configure.svg" data-i18n="[alt]Options..." alt="Options..." width="16" height="16" / data-i18n="Options...">Options...</a></li>
-                            <li><a id="registerMagnetHandlerLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/torrent-magnet.svg" data-i18n="[alt]Register to handle magnet links..." alt="Register to handle magnet links..." width="16" height="16" / data-i18n="Register to handle magnet links...">Register to handle magnet links...</a></li>
+                            <li><a id="preferencesLink"><img class="MyMenuIcon qbt-translatable" src="images/configure.svg" data-i18n="[alt]Options..." alt="Options..." width="16" height="16" / data-i18n="Options...">Options...</a></li>
+                            <li><a id="registerMagnetHandlerLink"><img class="MyMenuIcon qbt-translatable" src="images/torrent-magnet.svg" data-i18n="[alt]Register to handle magnet links..." alt="Register to handle magnet links..." width="16" height="16" / data-i18n="Register to handle magnet links...">Register to handle magnet links...</a></li>
                         </ul>
                     </li>
                     <li>
                         <a class="returnFalse qbt-translatable" data-i18n="Help">Help</a>
                         <ul>
-                            <li><a id="docsLink" target="_blank" href="https://wiki.qbittorrent.org/"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/help-contents.svg" data-i18n="[alt]Documentation" alt="Documentation" width="16" height="16" / data-i18n="Documentation">Documentation</a></li>
-                            <li class="divider qbt-translatable qbt-translatable"><a id="bugLink" target="_blank" href="https://www.qbittorrent.org/donate"><img class="MyMenuIcon" src="images/wallet-open.svg" data-i18n="[alt]Donate!" alt="Donate!" width="16" height="16" / data-i18n="Donate!">Donate!</a></li>
-                            <li><a id="aboutLink"><img class="MyMenuIcon qbt-translatable qbt-translatable" src="images/help-about.svg" data-i18n="[alt]About" alt="About" width="16" height="16" / data-i18n="About">About</a></li>
+                            <li><a id="docsLink" target="_blank" href="https://wiki.qbittorrent.org/"><img class="MyMenuIcon qbt-translatable" src="images/help-contents.svg" data-i18n="[alt]Documentation" alt="Documentation" width="16" height="16" / data-i18n="Documentation">Documentation</a></li>
+                            <li class="divider qbt-translatable"><a id="bugLink" target="_blank" href="https://www.qbittorrent.org/donate"><img class="MyMenuIcon" src="images/wallet-open.svg" data-i18n="[alt]Donate!" alt="Donate!" width="16" height="16" / data-i18n="Donate!">Donate!</a></li>
+                            <li><a id="aboutLink"><img class="MyMenuIcon qbt-translatable" src="images/help-about.svg" data-i18n="[alt]About" alt="About" width="16" height="16" / data-i18n="About">About</a></li>
                         </ul>
                     </li>
                 </ul>
@@ -251,9 +251,9 @@ <h1 class="applicationTitle">qBittorrent Web User Interface <span class="version
                     <td class="statusBarSeparator"></td>
                     <td id="DHTNodes"></td>
                     <td class="statusBarSeparator"></td>
-                    <td><img id="connectionStatus" class="qbt-translatable qbt-translatable" data-i18n="[alt]Connection status: Firewalled" alt="Connection status: Firewalled" data-i18n="[title]Connection status: Firewalled" title="Connection status: Firewalled" src="images/firewalled.svg" style="height: 1.5em;" /></td>
+                    <td><img id="connectionStatus" class="qbt-translatable" data-i18n="[alt]Connection status: Firewalled" alt="Connection status: Firewalled" data-i18n="[title]Connection status: Firewalled" title="Connection status: Firewalled" src="images/firewalled.svg" style="height: 1.5em;" /></td>
                     <td class="statusBarSeparator"></td>
-                    <td style="cursor:pointer;"><img id="alternativeSpeedLimits" class="qbt-translatable qbt-translatable" data-i18n="[alt]Alternative speed limits: Off" alt="Alternative speed limits: Off" data-i18n="[title]Alternative speed limits: Off" title="Alternative speed limits: Off" src="images/slow_off.svg" style="height: 1.5em;" /></td>
+                    <td style="cursor:pointer;"><img id="alternativeSpeedLimits" class="qbt-translatable" data-i18n="[alt]Alternative speed limits: Off" alt="Alternative speed limits: Off" data-i18n="[title]Alternative speed limits: Off" title="Alternative speed limits: Off" src="images/slow_off.svg" style="height: 1.5em;" /></td>
                     <td class="statusBarSeparator"></td>
                     <td class="speedLabel"><img src="images/downloading.svg" class="qbt-translatable" data-i18n="[alt]Download speed icon" alt="Download speed icon" style="height: 1.5em; padding-right: 5px; margin-bottom: -4px;"><span id="DlInfos"></span></td>
                     <td class="statusBarSeparator"></td>
diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html
index 65057d43be3..7d157b1f53a 100644
--- a/src/webui/www/private/views/search.html
+++ b/src/webui/www/private/views/search.html
@@ -111,7 +111,7 @@
                 <option value="everywhere" class="qbt-translatable" data-i18n="Everywhere">Everywhere</option>
             </select>
 
-            <img id="searchResultsGranularFiltersWarning" src="images/dialog-warning.svg" class="qbt-translatable qbt-translatable" data-i18n="[title]Increase window width to display additional filters" title="Increase window width to display additional filters" data-i18n="[alt]Warning" alt="Warning" width="24" height="24">
+            <img id="searchResultsGranularFiltersWarning" src="images/dialog-warning.svg" class="qbt-translatable" data-i18n="[title]Increase window width to display additional filters" title="Increase window width to display additional filters" data-i18n="[alt]Warning" alt="Warning" width="24" height="24">
 
             <div id="searchResultsGranularFilters">
                 <span style="margin-left: 15px;" class="qbt-translatable" data-i18n="Seeds:">Seeds:</span>