diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js
index e497f35..d3ef363 100755
--- a/keepassxc-browser/background/browserAction.js
+++ b/keepassxc-browser/background/browserAction.js
@@ -16,6 +16,9 @@ browserAction.show = async function(tab, popupData) {
             tabId: tab.id,
             popup: `popups/${popupData.popup}.html`
         });
+
+        const badgeText = popupData.popup === 'popup_login' ? String(page.tabs[tab.id]?.loginList?.length) : '';
+        browserAction.setBadgeText(tab?.id, badgeText);
     }
 };
 
@@ -44,8 +47,9 @@ browserAction.showDefault = async function(tab) {
     }
 
     if (page.tabs[tab.id]?.loginList.length > 0) {
-        popupData.iconType = 'questionmark';
+        popupData.iconType = 'normal';
         popupData.popup = 'popup_login';
+        browserAction.setBadgeText(tab?.id, String(page.tabs[tab.id]?.loginList.length));
     }
 
     await browserAction.show(tab, popupData);
@@ -66,6 +70,11 @@ browserAction.updateIcon = async function(tab, iconType) {
     });
 };
 
+browserAction.setBadgeText = function(tabId, badgeText) {
+    browser.browserAction.setBadgeBackgroundColor({ color: '#666666' });
+    browser.browserAction.setBadgeText({ text: badgeText, tabId: tabId });
+};
+
 browserAction.generateIconName = async function(iconType) {
     let name = 'icon_';
     name += (await keepass.keePassXCUpdateAvailable()) ? 'new_' : '';
diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index 7c5d2d7..57f848a 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -154,7 +154,7 @@ kpxcEvent.onRemoveCredentialsFromTabInformation = async function(tab) {
 
 kpxcEvent.onLoginPopup = async function(tab, logins) {
     const popupData = {
-        iconType: 'questionmark',
+        iconType: 'normal',
         popup: 'popup_login'
     };
 
@@ -168,7 +168,7 @@ kpxcEvent.initHttpAuth = async function() {
 
 kpxcEvent.onHTTPAuthPopup = async function(tab, data) {
     const popupData = {
-        iconType: 'questionmark',
+        iconType: 'normal',
         popup: 'popup_httpauth'
     };
 
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png
deleted file mode 100644
index 22877a0..0000000
Binary files a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg
deleted file mode 100644
index 61bfe20..0000000
--- a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a"><stop offset="0" style="stop-color:#226e23;stop-opacity:1"/><stop offset="1" style="stop-color:#63ab3a;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="32.5" y1="8.79" x2="32.65" y2="54.87" gradientUnits="userSpaceOnUse"/></defs><g style="display:inline"><circle r="29.01" style="opacity:.871;fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke:#000;stroke-width:3.13187;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.784314" cx="32" cy="32"/><circle style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" cx="32" cy="32" r="26.73"/><path style="opacity:1;fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.57895;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M32 4.42a27.59 27.59 0 1 0 0 55.17 27.59 27.59 0 0 0 0-55.17Zm0 4.23c1.43 0 2.86.15 4.26.41a4.37 4.37 0 1 1-8.52 0c1.4-.27 2.83-.4 4.26-.4ZM20 12a12.23 12.23 0 0 0 6.75 13.42v22.16L32 52.82l5.24-5.24-.3-4.64 2.47-2.47L36.94 38l3.7-3.71-3.7-3.7.3-5.17A12.22 12.22 0 0 0 44 12a23.35 23.35 0 0 1 11.35 20 23.35 23.35 0 0 1-46.7 0A23.35 23.35 0 0 1 20 12Zm8.5 16.36h1.75v17.47h-1.74V28.36z"/><path style="opacity:.94;fill:url(#b);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.505263;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M36.26 9.06a4.37 4.37 0 1 1-8.52 0 23.35 23.35 0 0 1 8.52 0zm-16.5 5.32c0 4.87 2.87 9.07 7 11.04v22.16L32 52.82l5.24-5.24-.3-4.64 2.47-2.47L36.94 38l3.7-3.71-3.7-3.7.3-5.17A12.22 12.22 0 0 0 44 12a23.35 23.35 0 0 1 11.35 20 23.35 23.35 0 0 1-46.7 0A23.35 23.35 0 0 1 20 12a12.4 12.4 0 0 0-.23 2.38zm8.74 13.98h1.75v17.47h-1.74V28.36z"/></g><g stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke-width:1;stroke:#34220a;stroke-opacity:1"><g style="display:inline;stroke:#34220a;stroke-width:.845541;stroke-opacity:1"><path d="M17 33c-1.27-.04-3.5-11-4.39-11.9C11.74 20.25.96 18.24 1 17c.04-1.27 11-3.5 11.9-4.39C13.75 11.74 15.76.96 17 1c1.27.04 3.5 11 4.39 11.9.87.86 11.65 2.87 11.61 4.1-.04 1.27-11 3.5-11.9 4.39-.86.87-2.87 11.65-4.1 11.61z" display="inline" fill="#62c74d" stroke="none" style="display:inline;stroke:#102c0b;stroke-width:2.00001;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png
deleted file mode 100644
index d043eb1..0000000
Binary files a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg
deleted file mode 100644
index d2e4c03..0000000
--- a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a"><stop offset="0" style="stop-color:#226e23;stop-opacity:1"/><stop offset="1" style="stop-color:#63ab3a;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53.24" y1="12.75" x2="53.24" y2="86.36" gradientUnits="userSpaceOnUse"/></defs><g transform="translate(.42 .42) scale(.63158)" style="display:inline"><circle r="45.93" style="opacity:.871;fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke:#000;stroke-width:3.13187;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.784314" cx="50" cy="50"/><circle style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" cx="50" cy="50" r="42.32"/><path style="opacity:1;fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M50 6.32A43.68 43.68 0 0 0 6.32 50 43.68 43.68 0 0 0 50 93.68 43.68 43.68 0 0 0 93.68 50 43.68 43.68 0 0 0 50 6.32Zm0 6.72c2.26 0 4.52.22 6.75.64a6.92 6.92 0 1 1-13.5 0c2.23-.42 4.49-.64 6.75-.64Zm-19 5.3a19.36 19.36 0 0 0 10.7 21.24v35.09l8.3 8.3 8.3-8.3-.48-7.35 3.92-3.92-3.92-3.9 5.87-5.88-5.87-5.87.48-8.17A19.35 19.35 0 0 0 69 18.34 36.97 36.97 0 0 1 86.95 50a36.97 36.97 0 0 1-73.92 0c.01-12.98 6.83-25 17.97-31.67Zm13.46 25.9h2.77V71.9h-2.76V44.23z"/><path style="opacity:.94;fill:url(#b);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M56.75 13.68a6.91 6.91 0 1 1-13.5 0 36.48 36.48 0 0 1 13.5 0zM30.63 22.1c0 7.72 4.53 14.37 11.07 17.48v35.09l8.3 8.3 8.3-8.3-.48-7.35 3.92-3.92-3.92-3.9 5.87-5.88-5.87-5.87.48-8.17A19.35 19.35 0 0 0 69 18.34 36.97 36.97 0 0 1 86.95 50a36.97 36.97 0 0 1-73.92 0c.01-12.98 6.83-25 17.97-31.67a19.4 19.4 0 0 0-.38 3.77zm13.83 22.13h2.77V71.9h-2.76V44.24z"/></g><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png
deleted file mode 100644
index 6563b49..0000000
Binary files a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg
deleted file mode 100644
index 61fc1dc..0000000
--- a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M32 2C15.46 2 2 15.46 2 32s13.46 30 30 30 30-13.46 30-30S48.54 2 32 2Zm-4.2 7.25c1.38-.25 2.82-.38 4.2-.38a18.7 18.7 0 0 1 4.2.38 4.33 4.33 0 1 1-8.52.94c0-.32.06-.63.12-.94zm2.5 19.1v17.34h-1.74V28.34ZM32 56.13a24.23 24.23 0 0 1-12.45-45.01c-.13.85-.26 1.64-.26 2.49 0 5.04 2.95 9.43 7.27 11.46v23L32 53.52l5.44-5.44-.33-4.78 2.56-2.56-2.56-2.55 3.87-3.87-3.87-3.86.33-5.38a12.77 12.77 0 0 0 7.27-11.46c0-.85-.06-1.64-.26-2.5a24.45 24.45 0 0 1 11.8 20.78A24.23 24.23 0 0 1 32 56.14z" style="display:inline;fill:#fcfcfc;stroke-width:.492719"/><g stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke-width:1;stroke:#34220a;stroke-opacity:1"><g style="display:inline;stroke:#34220a;stroke-width:.845541;stroke-opacity:1"><path d="M17 33c-1.27-.04-3.5-11-4.39-11.9C11.74 20.25.96 18.24 1 17c.04-1.27 11-3.5 11.9-4.39C13.75 11.74 15.76.96 17 1c1.27.04 3.5 11 4.39 11.9.87.86 11.65 2.87 11.61 4.1-.04 1.27-11 3.5-11.9 4.39-.86.87-2.87 11.65-4.1 11.61z" display="inline" fill="#62c74d" stroke="none" style="display:inline;stroke:#102c0b;stroke-width:2.00001;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png
deleted file mode 100644
index 9a25bb5..0000000
Binary files a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg
deleted file mode 100644
index 5900d06..0000000
--- a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M32 2C15.46 2 2 15.46 2 32s13.46 30 30 30 30-13.46 30-30S48.54 2 32 2Zm-4.2 7.25c1.38-.25 2.82-.38 4.2-.38a18.7 18.7 0 0 1 4.2.38 4.33 4.33 0 1 1-8.52.94c0-.32.06-.63.12-.94zm2.5 19.1v17.34h-1.74V28.34ZM32 56.13a24.23 24.23 0 0 1-12.45-45.01c-.13.85-.26 1.64-.26 2.49 0 5.04 2.95 9.43 7.27 11.46v23L32 53.52l5.44-5.44-.33-4.78 2.56-2.56-2.56-2.55 3.87-3.87-3.87-3.86.33-5.38a12.77 12.77 0 0 0 7.27-11.46c0-.85-.06-1.64-.26-2.5a24.45 24.45 0 0 1 11.8 20.78A24.23 24.23 0 0 1 32 56.14z" style="display:inline;fill:#fcfcfc;stroke-width:.492719"/><g style="display:inline;stroke-width:1;stroke:#34220a;stroke-opacity:1"><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png
deleted file mode 100644
index 3873dad..0000000
Binary files a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg
deleted file mode 100644
index 295643c..0000000
--- a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;fill:#0f0f0d;stroke-width:.492611" d="M32 2C15.46 2 2 15.46 2 32s13.46 30 30 30 30-13.46 30-30S48.54 2 32 2Zm0 57.48A27.5 27.5 0 0 1 4.54 32 27.5 27.5 0 0 1 32 4.52 27.5 27.5 0 0 1 59.46 32 27.5 27.5 0 0 1 32 59.48zm11.9-47.35a12.2 12.2 0 0 1-6.7 13.34l-.32 5.13 3.7 3.7-3.7 3.69 2.44 2.44-2.44 2.44.32 4.57-5.2 5.2-5.2-5.2V25.46a12.1 12.1 0 0 1-6.94-10.95c0-.82.12-1.57.25-2.38a23.15 23.15 0 1 0 23.79 0zM32 14.5a4.33 4.33 0 0 0 4.32-4.32c0-.32-.06-.63-.13-.94A18.68 18.68 0 0 0 32 8.87c-1.38 0-2.82.13-4.2.38-.06.31-.12.62-.12.94A4.33 4.33 0 0 0 32 14.5zm-3.44 13.83h1.75V45.7h-1.75z"/><g stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke-width:1;stroke:#34220a;stroke-opacity:1"><g style="display:inline;stroke:#34220a;stroke-width:.845541;stroke-opacity:1"><path d="M17 33c-1.27-.04-3.5-11-4.39-11.9C11.74 20.25.96 18.24 1 17c.04-1.27 11-3.5 11.9-4.39C13.75 11.74 15.76.96 17 1c1.27.04 3.5 11 4.39 11.9.87.86 11.65 2.87 11.61 4.1-.04 1.27-11 3.5-11.9 4.39-.86.87-2.87 11.65-4.1 11.61z" display="inline" fill="#62c74d" stroke="none" style="display:inline;stroke:#102c0b;stroke-width:2.00001;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_questionmark.png b/keepassxc-browser/icons/toolbar/light/icon_questionmark.png
deleted file mode 100644
index eb83d9c..0000000
Binary files a/keepassxc-browser/icons/toolbar/light/icon_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg
deleted file mode 100644
index d443976..0000000
--- a/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;fill:#0f0f0d;stroke-width:.492611" d="M32 2C15.46 2 2 15.46 2 32s13.46 30 30 30 30-13.46 30-30S48.54 2 32 2Zm0 57.48A27.5 27.5 0 0 1 4.54 32 27.5 27.5 0 0 1 32 4.52 27.5 27.5 0 0 1 59.46 32 27.5 27.5 0 0 1 32 59.48zm11.9-47.35a12.2 12.2 0 0 1-6.7 13.34l-.32 5.13 3.7 3.7-3.7 3.69 2.44 2.44-2.44 2.44.32 4.57-5.2 5.2-5.2-5.2V25.46a12.1 12.1 0 0 1-6.94-10.95c0-.82.12-1.57.25-2.38a23.15 23.15 0 1 0 23.79 0zM32 14.5a4.33 4.33 0 0 0 4.32-4.32c0-.32-.06-.63-.13-.94A18.68 18.68 0 0 0 32 8.87c-1.38 0-2.82.13-4.2.38-.06.31-.12.62-.12.94A4.33 4.33 0 0 0 32 14.5zm-3.44 13.83h1.75V45.7h-1.75z"/><g style="display:inline;stroke-width:1;stroke:#34220a;stroke-opacity:1"><g style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><rect x="34.5" y="22.82" width="24" height="34" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(4.5 6.18)"/><path d="M48.3 49.53v-1.07c0-.93.2-1.74.59-2.43a7.8 7.8 0 0 1 2.18-2.2 8.93 8.93 0 0 0 2-1.77c.33-.46.5-.97.5-1.53 0-.63-.23-1.1-.7-1.44a3.32 3.32 0 0 0-1.95-.5c-1.45 0-3.1.48-4.97 1.43l-1.58-3.18a13.83 13.83 0 0 1 6.87-1.82c2 0 3.58.48 4.75 1.44a4.7 4.7 0 0 1 1.78 3.84c0 1.07-.24 1.99-.73 2.76-.48.78-1.4 1.65-2.76 2.62a8.77 8.77 0 0 0-1.77 1.57 2.5 2.5 0 0 0-.37 1.41v.87zm-.47 4.98c0-.82.22-1.43.65-1.85.44-.42 1.07-.62 1.9-.62.81 0 1.43.2 1.87.64.44.42.66 1.03.66 1.83a2.5 2.5 0 0 1-.66 1.82c-.45.43-1.07.65-1.86.65-.82 0-1.45-.21-1.9-.64a2.45 2.45 0 0 1-.66-1.83Z" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:.869436;stroke-opacity:1"/></g></g></svg>