diff --git a/assets/images/wrench.svg b/assets/images/wrench.svg
index afa826ab10b..2865c40eb95 100644
--- a/assets/images/wrench.svg
+++ b/assets/images/wrench.svg
@@ -1,4 +1,4 @@
-<svg width="26" height="26" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
 <g id="Wrench" clip-path="url(#clip0_931_152974)">
 <path id="Shape" fill-rule="evenodd" clip-rule="evenodd" d="M25.1669 8C25.1669 12.1421 21.809 15.5 17.6669 15.5C17.1701 15.5 16.6846 15.4517 16.2148 15.3595C15.7623 15.2708 15.2846 15.3822 14.9586 15.7083L7.04188 23.625C5.66117 25.0057 3.4226 25.0057 2.04188 23.625C0.661171 22.2443 0.661169 20.0057 2.04188 18.625L9.95858 10.7083C10.2846 10.3822 10.3961 9.90462 10.3074 9.45212C10.2152 8.98233 10.1669 8.4968 10.1669 8C10.1669 3.85786 13.5247 0.5 17.6669 0.5C18.4483 0.5 19.2018 0.619501 19.9101 0.841225C20.327 0.97174 20.424 1.49292 20.115 1.80185L15.7919 6.125L16.4169 9.25L19.5419 9.875L23.865 5.55185C24.174 5.24292 24.6951 5.33985 24.8257 5.75678C25.0474 6.46509 25.1669 7.21859 25.1669 8ZM5.79188 21.125C5.79188 21.8154 5.23224 22.375 4.54188 22.375C3.85153 22.375 3.29188 21.8154 3.29188 21.125C3.29188 20.4346 3.85153 19.875 4.54188 19.875C5.23224 19.875 5.79188 20.4346 5.79188 21.125Z"/>
 </g>
diff --git a/src/pages/home/sidebar/AllSettingsScreen.js b/src/pages/home/sidebar/AllSettingsScreen.js
index b3f70409570..3c7298c3d95 100644
--- a/src/pages/home/sidebar/AllSettingsScreen.js
+++ b/src/pages/home/sidebar/AllSettingsScreen.js
@@ -89,7 +89,7 @@ function AllSettingsScreen() {
                                 }
                             })}
                             shouldBlockSelection={Boolean(item.link)}
-                            focused={activeRoute && activeRoute.startsWith(item.routeName)}
+                            focused={activeRoute && item.routeName && activeRoute.toLowerCase().replaceAll('_', '') === item.routeName.replaceAll('/', '')}
                             isPaneMenu
                         />
                     );