diff --git a/.eslintrc b/.eslintrc
index cb4c5c4..cfac49d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -154,6 +154,7 @@
         "resizePopup": true,
         "sendMessage": true,
         "showNotification": true,
+        "useMonochromToolbarIcon": false,
         "siteMatch": true,
         "slashNeededForUrl": true,
         "SORT_BY_GROUP_AND_TITLE": true,
diff --git a/dev-resources/readme.md b/dev-resources/readme.md
new file mode 100644
index 0000000..0d6a897
--- /dev/null
+++ b/dev-resources/readme.md
@@ -0,0 +1,13 @@
+# Dev Resources
+
+## Toolbar Icons
+
+The file `toolbar_icon_source.svg` contains the complete set of graphics in different layers. To create an individual icon out of it, follow this procedure:
+
+1. Open `toolbar_icon_source.svg`, e.g. in Inkscape
+2. Hide/show the layers needed to compose your desired icon
+3. "Export" the icon to PNG, 36x36 pixel size (for Chrome/Edge)
+4. "Save as copy" the icon as "Optimized SVG" (for Firefox)
+5. Repeat for all desired icon versions
+
+**Note:** The extension will choose the icon to show by _filename_, so make sure that is correct (take a look at the existing icon sets for reference).
diff --git a/dev-resources/toolbar_icon_source.svg b/dev-resources/toolbar_icon_source.svg
new file mode 100644
index 0000000..15491f0
--- /dev/null
+++ b/dev-resources/toolbar_icon_source.svg
@@ -0,0 +1,820 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="64"
+   width="64"
+   id="svg2"
+   viewBox="0 0 64 64"
+   version="1.1"
+   sodipodi:docname="toolbar_icon_source.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:export-filename="../keepassxc-browser/icons/toolbar/colored/icon_locked.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"><defs
+     id="defs23"><linearGradient
+       id="linearGradient4316"><stop
+         id="stop4258"
+         offset="0"
+         style="stop-color:#226e23;stop-opacity:1" /><stop
+         id="stop4260"
+         offset="1"
+         style="stop-color:#63ab3a;stop-opacity:1" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient5488"><stop
+         style="stop-color:#eaa74b;stop-opacity:1;"
+         offset="0"
+         id="stop5484" /><stop
+         style="stop-color:#a3703c;stop-opacity:1;"
+         offset="1"
+         id="stop5486" /></linearGradient><linearGradient
+       id="linearGradient3302"><stop
+         id="stop3298"
+         offset="0"
+         style="stop-color:#606060;stop-opacity:1;" /><stop
+         id="stop3300"
+         offset="1"
+         style="stop-color:#999999;stop-opacity:1;" /></linearGradient><linearGradient
+       id="SVGID_2_-3"
+       gradientUnits="userSpaceOnUse"
+       x1="73.800003"
+       y1="1532.1382"
+       x2="73.800003"
+       y2="1574.0038"
+       gradientTransform="matrix(1.5764368,0,0,1.5764001,5.7113969,-2332.322)"><stop
+         offset="0"
+         style="stop-color:#eaa74b;stop-opacity:1;"
+         id="stop373" /><stop
+         offset="1"
+         style="stop-color:#ac6f25;stop-opacity:1;"
+         id="stop375" /></linearGradient><linearGradient
+       xlink:href="#linearGradient4316"
+       id="linearGradient5199"
+       x1="53.238865"
+       y1="12.753036"
+       x2="53.238865"
+       y2="86.356995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5930485,0,0,1.5930485,-80.665646,19.191938)" /><linearGradient
+       id="linearGradient4316-1"><stop
+         id="stop4318"
+         offset="0"
+         style="stop-color:#464646;stop-opacity:1;" /><stop
+         id="stop4320"
+         offset="1"
+         style="stop-color:#adadad;stop-opacity:1;" /></linearGradient><linearGradient
+       osb:paint="solid"
+       id="linearGradient4153"><stop
+         id="stop4155"
+         offset="0"
+         style="stop-color:#b3b3b3;stop-opacity:1;" /></linearGradient><linearGradient
+       gradientTransform="matrix(1.0561225,0,0,1.0561225,-2.8061215,-1008.6172)"
+       gradientUnits="userSpaceOnUse"
+       y2="1042.2632"
+       x2="50.757614"
+       y1="964.83679"
+       x1="50.757614"
+       id="linearGradient4324"
+       xlink:href="#linearGradient4316" /><radialGradient
+       xlink:href="#linearGradient4316"
+       id="radialGradient5106"
+       cx="-82.91127"
+       cy="41.189114"
+       fx="-82.91127"
+       fy="41.189114"
+       r="43.571938"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       gradientTransform="matrix(1.0561225,0,0,1.0561225,118.96071,-1109.1994)"
+       gradientUnits="userSpaceOnUse"
+       y2="1042.2632"
+       x2="50.757614"
+       y1="964.83679"
+       x1="50.757614"
+       id="linearGradient4324-3"
+       xlink:href="#linearGradient4316" /><linearGradient
+       gradientTransform="matrix(1.0561225,0,0,1.0561225,-2.8061235,-1008.6171)"
+       gradientUnits="userSpaceOnUse"
+       y2="1042.2632"
+       x2="50.757614"
+       y1="964.83679"
+       x1="50.757614"
+       id="linearGradient4324-3-6"
+       xlink:href="#linearGradient4316" /><linearGradient
+       xlink:href="#linearGradient3302"
+       id="linearGradient5199-5"
+       x1="31.952547"
+       y1="8.5148602"
+       x2="32.200859"
+       y2="55.714256"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="d"
+       x1="63.9998"
+       y1="-3.314"
+       x2="63.9998"
+       y2="118.486"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#414141"
+         id="stop2734" /><stop
+         offset=".196"
+         stop-color="#3e3e3e"
+         id="stop2736" /><stop
+         offset="1"
+         stop-color="#3a3a3a"
+         id="stop2738" /></linearGradient><radialGradient
+       id="f"
+       cx="32.6464"
+       cy="32.9151"
+       fx="32.6464"
+       fy="32.9151"
+       r="207.2339"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".6733"
+         stop-color="#fcfcfc"
+         stop-opacity="0"
+         id="stop2741" /><stop
+         offset="1"
+         stop-color="#fcfcfc"
+         id="stop2743" /></radialGradient><radialGradient
+       id="h"
+       cx="40.9922"
+       cy="60.2127"
+       fx="40.9922"
+       fy="60.2127"
+       r="172.3893"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".1088"
+         stop-color="#0f0f0d"
+         stop-opacity="0"
+         id="stop2746" /><stop
+         offset=".8856"
+         stop-color="#414141"
+         stop-opacity="0"
+         id="stop2748" /><stop
+         offset=".9339"
+         stop-color="#1e1e1d"
+         stop-opacity=".6841"
+         id="stop2750" /><stop
+         offset=".9874"
+         stop-color="#0f0f0d"
+         id="stop2752" /></radialGradient><radialGradient
+       id="l"
+       cx="46.7377"
+       cy="-43.1522"
+       fx="46.7377"
+       fy="-43.1522"
+       r="334.8364"
+       gradientTransform="matrix(0.3539,0,0,0.2026,48.6185,35.1949)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#5e5e60"
+         id="stop2755" /><stop
+         offset="1"
+         stop-color="#9c9c9c"
+         id="stop2757" /></radialGradient><radialGradient
+       id="n"
+       cx="44.2325"
+       cy="-44.9179"
+       fx="44.2325"
+       fy="-44.9179"
+       r="65.3925"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#9e9e9e"
+         id="stop2760" /><stop
+         offset="1"
+         stop-color="gray"
+         id="stop2762" /></radialGradient><radialGradient
+       id="p"
+       cx="29.2172"
+       cy="-1.8335"
+       fx="29.2172"
+       fy="-1.8335"
+       r="96.5851"
+       gradientTransform="matrix(0.3356,0,0,0.5572,54.1107,40.1419)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#000"
+         id="stop2765" /><stop
+         offset=".7842"
+         stop-color="#4f4f4f"
+         stop-opacity="0"
+         id="stop2767" /></radialGradient><radialGradient
+       id="s"
+       cx="42.8397"
+       cy="-64.5727"
+       fx="42.8397"
+       fy="-64.5727"
+       r="223.5101"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#f5f5f5"
+         id="stop2770" /><stop
+         offset=".5286"
+         stop-color="#f2f2f2"
+         id="stop2772" /></radialGradient><radialGradient
+       id="v"
+       cx="80.5687"
+       cy="46.7363"
+       fx="80.5687"
+       fy="46.7363"
+       r="35.2158"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#bcbcbc"
+         id="stop2775" /><stop
+         offset="1"
+         stop-color="#7a7773"
+         id="stop2777" /></radialGradient><radialGradient
+       id="w"
+       cx="82.5929"
+       cy="78.7539"
+       fx="82.5929"
+       fy="78.7539"
+       r="50.9171"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#eba84b"
+         id="stop2780" /><stop
+         offset="1"
+         stop-color="#9b6a3a"
+         id="stop2782" /></radialGradient><linearGradient
+       id="d-2"
+       x1="63.9998"
+       y1="-3.314"
+       x2="63.9998"
+       y2="118.486"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#414141"
+         id="stop3086" /><stop
+         offset=".196"
+         stop-color="#3e3e3e"
+         id="stop3088" /><stop
+         offset="1"
+         stop-color="#3a3a3a"
+         id="stop3090" /></linearGradient><radialGradient
+       id="f-7"
+       cx="32.6464"
+       cy="32.9151"
+       fx="32.6464"
+       fy="32.9151"
+       r="207.2339"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".6733"
+         stop-color="#fcfcfc"
+         stop-opacity="0"
+         id="stop3093" /><stop
+         offset="1"
+         stop-color="#fcfcfc"
+         id="stop3095" /></radialGradient><radialGradient
+       id="h-0"
+       cx="40.9922"
+       cy="60.2127"
+       fx="40.9922"
+       fy="60.2127"
+       r="172.3893"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".1088"
+         stop-color="#0f0f0d"
+         stop-opacity="0"
+         id="stop3098" /><stop
+         offset=".8856"
+         stop-color="#414141"
+         stop-opacity="0"
+         id="stop3100" /><stop
+         offset=".9339"
+         stop-color="#1e1e1d"
+         stop-opacity=".6841"
+         id="stop3102" /><stop
+         offset=".9874"
+         stop-color="#0f0f0d"
+         id="stop3104" /></radialGradient><radialGradient
+       id="l-9"
+       cx="46.7377"
+       cy="-43.1522"
+       fx="46.7377"
+       fy="-43.1522"
+       r="334.8364"
+       gradientTransform="matrix(0.3539,0,0,0.2026,48.6185,35.1949)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#5e5e60"
+         id="stop3107" /><stop
+         offset="1"
+         stop-color="#9c9c9c"
+         id="stop3109" /></radialGradient><radialGradient
+       id="n-3"
+       cx="44.2325"
+       cy="-44.9179"
+       fx="44.2325"
+       fy="-44.9179"
+       r="65.3925"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#9e9e9e"
+         id="stop3112" /><stop
+         offset="1"
+         stop-color="gray"
+         id="stop3114" /></radialGradient><radialGradient
+       id="p-6"
+       cx="29.2172"
+       cy="-1.8335"
+       fx="29.2172"
+       fy="-1.8335"
+       r="96.5851"
+       gradientTransform="matrix(0.3356,0,0,0.5572,54.1107,40.1419)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#000"
+         id="stop3117" /><stop
+         offset=".7842"
+         stop-color="#4f4f4f"
+         stop-opacity="0"
+         id="stop3119" /></radialGradient><radialGradient
+       id="s-0"
+       cx="42.8397"
+       cy="-64.5727"
+       fx="42.8397"
+       fy="-64.5727"
+       r="223.5101"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#f5f5f5"
+         id="stop3122" /><stop
+         offset=".5286"
+         stop-color="#f2f2f2"
+         id="stop3124" /></radialGradient><radialGradient
+       id="v-6"
+       cx="80.5687"
+       cy="46.7363"
+       fx="80.5687"
+       fy="46.7363"
+       r="35.2158"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#bcbcbc"
+         id="stop3127" /><stop
+         offset="1"
+         stop-color="#7a7773"
+         id="stop3129" /></radialGradient><radialGradient
+       id="w-2"
+       cx="82.5929"
+       cy="78.7539"
+       fx="82.5929"
+       fy="78.7539"
+       r="50.9171"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#eba84b"
+         id="stop3132" /><stop
+         offset="1"
+         stop-color="#9b6a3a"
+         id="stop3134" /></radialGradient><linearGradient
+       id="d-9"
+       x1="63.9998"
+       y1="-3.314"
+       x2="63.9998"
+       y2="118.486"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#414141"
+         id="stop5271" /><stop
+         offset=".196"
+         stop-color="#3e3e3e"
+         id="stop5273" /><stop
+         offset="1"
+         stop-color="#3a3a3a"
+         id="stop5275" /></linearGradient><radialGradient
+       id="f-2"
+       cx="32.6464"
+       cy="32.9151"
+       fx="32.6464"
+       fy="32.9151"
+       r="207.2339"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".6733"
+         stop-color="#fcfcfc"
+         stop-opacity="0"
+         id="stop5278" /><stop
+         offset="1"
+         stop-color="#fcfcfc"
+         id="stop5280" /></radialGradient><radialGradient
+       id="h-02"
+       cx="40.9922"
+       cy="60.2127"
+       fx="40.9922"
+       fy="60.2127"
+       r="172.3893"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset=".1088"
+         stop-color="#0f0f0d"
+         stop-opacity="0"
+         id="stop5283" /><stop
+         offset=".8856"
+         stop-color="#414141"
+         stop-opacity="0"
+         id="stop5285" /><stop
+         offset=".9339"
+         stop-color="#1e1e1d"
+         stop-opacity=".6841"
+         id="stop5287" /><stop
+         offset=".9874"
+         stop-color="#0f0f0d"
+         id="stop5289" /></radialGradient><radialGradient
+       id="l-3"
+       cx="46.7377"
+       cy="-43.1522"
+       fx="46.7377"
+       fy="-43.1522"
+       r="334.8364"
+       gradientTransform="matrix(0.3539,0,0,0.2026,48.6185,35.1949)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#5e5e60"
+         id="stop5292" /><stop
+         offset="1"
+         stop-color="#9c9c9c"
+         id="stop5294" /></radialGradient><radialGradient
+       id="n-7"
+       cx="44.2325"
+       cy="-44.9179"
+       fx="44.2325"
+       fy="-44.9179"
+       r="65.3925"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#9e9e9e"
+         id="stop5297" /><stop
+         offset="1"
+         stop-color="gray"
+         id="stop5299" /></radialGradient><radialGradient
+       id="p-5"
+       cx="29.2172"
+       cy="-1.8335"
+       fx="29.2172"
+       fy="-1.8335"
+       r="96.5851"
+       gradientTransform="matrix(0.3356,0,0,0.5572,54.1107,40.1419)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#000"
+         id="stop5302" /><stop
+         offset=".7842"
+         stop-color="#4f4f4f"
+         stop-opacity="0"
+         id="stop5304" /></radialGradient><radialGradient
+       id="s-9"
+       cx="42.8397"
+       cy="-64.5727"
+       fx="42.8397"
+       fy="-64.5727"
+       r="223.5101"
+       gradientTransform="matrix(0.3539,0,0,0.3539,48.6185,41.6546)"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#f5f5f5"
+         id="stop5307" /><stop
+         offset=".5286"
+         stop-color="#f2f2f2"
+         id="stop5309" /></radialGradient><radialGradient
+       id="v-2"
+       cx="80.5687"
+       cy="46.7363"
+       fx="80.5687"
+       fy="46.7363"
+       r="35.2158"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#bcbcbc"
+         id="stop5312" /><stop
+         offset="1"
+         stop-color="#7a7773"
+         id="stop5314" /></radialGradient><radialGradient
+       id="w-28"
+       cx="82.5929"
+       cy="78.7539"
+       fx="82.5929"
+       fy="78.7539"
+       r="50.9171"
+       gradientUnits="userSpaceOnUse"><stop
+         offset="0"
+         stop-color="#eba84b"
+         id="stop5317" /><stop
+         offset="1"
+         stop-color="#9b6a3a"
+         id="stop5319" /></radialGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5488"
+       id="linearGradient5490"
+       x1="39.430637"
+       y1="42.249115"
+       x2="57.96524"
+       y2="56.87579"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient4316"
+       id="radialGradient5106-1"
+       cx="-82.91127"
+       cy="41.189114"
+       fx="-82.91127"
+       fy="41.189114"
+       r="43.571938"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#linearGradient4316"
+       id="linearGradient5199-2"
+       x1="32.499001"
+       y1="8.7893534"
+       x2="32.647648"
+       y2="54.86882"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient4316"
+       id="radialGradient5106-3"
+       cx="-82.91127"
+       cy="41.189114"
+       fx="-82.91127"
+       fy="41.189114"
+       r="43.571938"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient4316"
+       id="radialGradient5106-0"
+       cx="-82.91127"
+       cy="41.189114"
+       fx="-82.91127"
+       fy="41.189114"
+       r="43.571938"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient4316"
+       id="radialGradient5106-35"
+       cx="-82.91127"
+       cy="41.189114"
+       fx="-82.91127"
+       fy="41.189114"
+       r="43.571938"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       xlink:href="#linearGradient4316"
+       id="linearGradient5199-6"
+       x1="53.238865"
+       y1="12.753036"
+       x2="53.238865"
+       y2="86.356995"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4316-1"
+       id="linearGradient4263"
+       gradientUnits="userSpaceOnUse"
+       x1="53.238865"
+       y1="12.753036"
+       x2="53.238865"
+       y2="86.356995" /></defs><sodipodi:namedview
+     id="namedview21"
+     pagecolor="#4f4f4f"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.125"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:window-width="883"
+     inkscape:window-height="917"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g575"
+     showguides="false"
+     inkscape:lockguides="false"><inkscape:grid
+       type="xygrid"
+       id="grid1714"
+       originx="0"
+       originy="0" /><sodipodi:guide
+       position="2,44"
+       orientation="-1,0"
+       id="guide2170"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" /><sodipodi:guide
+       position="20,62"
+       orientation="0,1"
+       id="guide2172"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" /><sodipodi:guide
+       position="62,44"
+       orientation="-1,0"
+       id="guide2174"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" /><sodipodi:guide
+       position="20,2"
+       orientation="0,1"
+       id="guide2176"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" /></sodipodi:namedview><linearGradient
+     id="SVGID_1_"
+     gradientUnits="userSpaceOnUse"
+     x1="50.269299"
+     y1="-1470.9402"
+     x2="49.6968"
+     y2="-1392.7863"
+     gradientTransform="matrix(1.5930719,0,0,-1.5930719,-80.338435,-2186.454)"><stop
+       offset="0"
+       style="stop-color:gray"
+       id="stop4" /><stop
+       offset="1"
+       style="stop-color:#4b4b4d"
+       id="stop6" /></linearGradient><linearGradient
+     id="SVGID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="73.800003"
+     y1="1532.1382"
+     x2="73.800003"
+     y2="1574.0038"
+     gradientTransform="translate(-2.7294229,-1488.3381)"><stop
+       offset="0"
+       style="stop-color:#d69029"
+       id="stop11" /><stop
+       offset="1"
+       style="stop-color:#af7125"
+       id="stop13" /></linearGradient><g
+     id="g4250"
+     inkscape:label="colored-icon-inactive"
+     style="display:none"
+     transform="matrix(0.63157892,0,0,0.63157892,0.421054,0.421054)"><circle
+       r="45.934067"
+       style="opacity:0.871;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.13187;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.784314"
+       id="circle4242"
+       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"
+       id="circle4244"
+       cx="50"
+       cy="50.000023"
+       r="42.32143" /><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="M 50,6.3242189 A 43.676472,43.676472 0 0 0 6.3242189,50 43.676472,43.676472 0 0 0 50,93.675781 43.676472,43.676472 0 0 0 93.675781,50 43.676472,43.676472 0 0 0 50,6.3242189 Z m 0,6.7109371 c 2.26423,0.0083 4.523397,0.224904 6.748047,0.646485 0.10716,0.48368 0.167969,0.98402 0.167969,1.5 0,3.82265 -3.097269,6.918015 -6.917969,6.916015 -3.82069,0.0022 -6.916016,-3.091382 -6.916016,-6.914062 0,-0.5181 0.06204,-1.02034 0.169922,-1.50586 C 45.476743,13.257569 47.7359,13.042035 50,13.035156 Z m -18.994141,5.298828 c -0.24053,1.21916 -0.371333,2.474142 -0.371093,3.763672 0,7.71966 4.528393,14.367959 11.064453,17.480469 v 35.089844 l 8.298828,8.298828 8.300781,-8.300781 -0.476562,-7.34961 3.914062,-3.912109 -3.914062,-3.912109 5.871093,-5.867188 -5.871093,-5.871094 0.476562,-8.177734 c 6.53802,-3.11057 11.066406,-9.758856 11.066406,-17.478516 0,-1.28696 -0.133397,-2.540982 -0.373046,-3.757812 C 80.124647,25.007387 86.946634,37.023584 86.964844,50 86.964304,70.414588 70.41459,86.964292 50,86.964844 29.58541,86.964292 13.035701,70.414589 13.035156,50 13.050706,37.021755 19.872279,25.003208 31.005859,18.333984 Z m 13.458985,25.898438 h 2.767578 v 27.666016 h -2.765625 l -0.002,-27.664063 v -0.002 z"
+       id="path4246" /><path
+       style="opacity:0.94;fill:url(#linearGradient4263);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.747561,13.681815 c 0.107159,0.48368 0.16838,0.98465 0.16838,1.50063 0,3.822651 -3.097351,6.917921 -6.91805,6.915921 -3.82069,0.0022 -6.91594,-3.09115 -6.91594,-6.913831 0,-0.5181 0.0626,-1.02142 0.17048,-1.50694 C 45.477221,13.25743 47.7359,13.042554 50,13.035675 c 2.26423,0.0083 4.52291,0.224559 6.747561,0.64614 z m -26.11261,8.416551 c 0,7.71966 4.528179,14.36677 11.064239,17.47928 v 35.091179 l 8.2987,8.2987 8.30082,-8.3008 -0.47566,-7.3495 3.91258,-3.9126 -3.91258,-3.9126 5.86992,-5.867799 -5.86992,-5.8699 0.47565,-8.17878 c 6.53802,-3.11057 11.06635,-9.75752 11.06635,-17.47718 0,-1.28696 -0.13288,-2.54209 -0.37253,-3.75892 11.132459,6.667543 17.953549,18.684164 17.97176,31.66058 C 86.96374,70.414615 70.414591,86.963775 50,86.964325 29.58541,86.963775 13.03626,70.414615 13.03572,50.000026 c 0.0155,-12.978245 6.83607,-24.997676 17.96965,-31.6669 -0.24053,1.21916 -0.37066,2.47571 -0.370419,3.76524 z m 13.829769,22.13472 h 2.76764 v 27.665839 h -2.76554 l -0.002,-27.663749 v -0.002 z"
+       id="path4248" /></g><g
+     id="g3783"
+     transform="matrix(0.63157892,0,0,0.63157892,0.421054,0.421054)"
+     inkscape:label="colored-icon"
+     style="display:inline"><circle
+       r="45.934067"
+       style="opacity:0.871;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.13187;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.784314"
+       id="circle3775"
+       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"
+       id="circle3777"
+       cx="50"
+       cy="50.000023"
+       r="42.32143" /><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="M 50,6.3242189 A 43.676472,43.676472 0 0 0 6.3242189,50 43.676472,43.676472 0 0 0 50,93.675781 43.676472,43.676472 0 0 0 93.675781,50 43.676472,43.676472 0 0 0 50,6.3242189 Z m 0,6.7109371 c 2.26423,0.0083 4.523397,0.224904 6.748047,0.646485 0.10716,0.48368 0.167969,0.98402 0.167969,1.5 0,3.82265 -3.097269,6.918015 -6.917969,6.916015 -3.82069,0.0022 -6.916016,-3.091382 -6.916016,-6.914062 0,-0.5181 0.06204,-1.02034 0.169922,-1.50586 C 45.476743,13.257569 47.7359,13.042035 50,13.035156 Z m -18.994141,5.298828 c -0.24053,1.21916 -0.371333,2.474142 -0.371093,3.763672 0,7.71966 4.528393,14.367959 11.064453,17.480469 v 35.089844 l 8.298828,8.298828 8.300781,-8.300781 -0.476562,-7.34961 3.914062,-3.912109 -3.914062,-3.912109 5.871093,-5.867188 -5.871093,-5.871094 0.476562,-8.177734 c 6.53802,-3.11057 11.066406,-9.758856 11.066406,-17.478516 0,-1.28696 -0.133397,-2.540982 -0.373046,-3.757812 C 80.124647,25.007387 86.946634,37.023584 86.964844,50 86.964304,70.414588 70.41459,86.964292 50,86.964844 29.58541,86.964292 13.035701,70.414589 13.035156,50 13.050706,37.021755 19.872279,25.003208 31.005859,18.333984 Z m 13.458985,25.898438 h 2.767578 v 27.666016 h -2.765625 l -0.002,-27.664063 v -0.002 z"
+       id="path3779" /><path
+       style="opacity:0.94;fill:url(#linearGradient5199-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.747561,13.681815 c 0.107159,0.48368 0.16838,0.98465 0.16838,1.50063 0,3.822651 -3.097351,6.917921 -6.91805,6.915921 -3.82069,0.0022 -6.91594,-3.09115 -6.91594,-6.913831 0,-0.5181 0.0626,-1.02142 0.17048,-1.50694 C 45.477221,13.25743 47.7359,13.042554 50,13.035675 c 2.26423,0.0083 4.52291,0.224559 6.747561,0.64614 z m -26.11261,8.416551 c 0,7.71966 4.528179,14.36677 11.064239,17.47928 v 35.091179 l 8.2987,8.2987 8.30082,-8.3008 -0.47566,-7.3495 3.91258,-3.9126 -3.91258,-3.9126 5.86992,-5.867799 -5.86992,-5.8699 0.47565,-8.17878 c 6.53802,-3.11057 11.06635,-9.75752 11.06635,-17.47718 0,-1.28696 -0.13288,-2.54209 -0.37253,-3.75892 11.132459,6.667543 17.953549,18.684164 17.97176,31.66058 C 86.96374,70.414615 70.414591,86.963775 50,86.964325 29.58541,86.963775 13.03626,70.414615 13.03572,50.000026 c 0.0155,-12.978245 6.83607,-24.997676 17.96965,-31.6669 -0.24053,1.21916 -0.37066,2.47571 -0.370419,3.76524 z m 13.829769,22.13472 h 2.76764 v 27.665839 h -2.76554 l -0.002,-27.663749 v -0.002 z"
+       id="path3781" /></g><path
+     d="M 32.0001,2.00002 C 15.458,2.00002 2.00001,15.458 2.00001,32 2.00001,48.5421 15.458,62 32.0001,62 48.5422,62 62,48.5419 62,32 62,15.4581 48.5422,2.00002 32.0001,2.00002 Z m -4.1958,7.24744 c 1.3777,-0.25044 2.8181,-0.37567 4.1958,-0.37567 1.4404,-0.06261 2.8181,0.12523 4.1958,0.37567 0.0627,0.31305 0.1253,0.62606 0.1253,0.93914 0,2.3792 -1.9414,4.3201 -4.3211,4.3201 -2.3796,0 -4.321,-1.9409 -4.321,-4.3201 0,-0.31308 0.0626,-0.62609 0.1252,-0.93914 z m 2.505,19.09594 V 45.6863 H 28.5558 V 28.3434 Z m 1.6908,27.7952 c -13.3683,0 -24.24642,-10.8101 -24.24642,-24.2408 0,-8.5171 4.45612,-16.379 11.79552,-20.7685 -0.131,0.8517 -0.2621,1.6379 -0.2621,2.4896 0,5.0447 2.9489,9.4343 7.2739,11.4653 v 22.996 l 5.4391,5.4378 5.4391,-5.4378 -0.3277,-4.7827 2.5558,-2.5551 -2.5558,-2.5551 3.8664,-3.8655 -3.8664,-3.8654 0.3277,-5.3722 c 4.2595,-2.031 7.2739,-6.4206 7.2739,-11.4653 0,-0.8517 -0.0655,-1.6379 -0.2621,-2.4896 7.2739,4.3896 11.73,12.2515 11.7955,20.7686 0,13.3651 -10.8126,24.2407 -24.2464,24.2407 z"
+     style="display:none;opacity:0.5;fill:#fcfcfc;stroke-width:0.492719"
+     id="path3556"
+     inkscape:label="dark-icon-inactive" /><path
+     d="M 32.0001,2.00002 C 15.458,2.00002 2.00001,15.458 2.00001,32 2.00001,48.5421 15.458,62 32.0001,62 48.5422,62 62,48.5419 62,32 62,15.4581 48.5422,2.00002 32.0001,2.00002 Z m -4.1958,7.24744 c 1.3777,-0.25044 2.8181,-0.37567 4.1958,-0.37567 1.4404,-0.06261 2.8181,0.12523 4.1958,0.37567 0.0627,0.31305 0.1253,0.62606 0.1253,0.93914 0,2.3792 -1.9414,4.3201 -4.3211,4.3201 -2.3796,0 -4.321,-1.9409 -4.321,-4.3201 0,-0.31308 0.0626,-0.62609 0.1252,-0.93914 z m 2.505,19.09594 V 45.6863 H 28.5558 V 28.3434 Z m 1.6908,27.7952 c -13.3683,0 -24.24642,-10.8101 -24.24642,-24.2408 0,-8.5171 4.45612,-16.379 11.79552,-20.7685 -0.131,0.8517 -0.2621,1.6379 -0.2621,2.4896 0,5.0447 2.9489,9.4343 7.2739,11.4653 v 22.996 l 5.4391,5.4378 5.4391,-5.4378 -0.3277,-4.7827 2.5558,-2.5551 -2.5558,-2.5551 3.8664,-3.8655 -3.8664,-3.8654 0.3277,-5.3722 c 4.2595,-2.031 7.2739,-6.4206 7.2739,-11.4653 0,-0.8517 -0.0655,-1.6379 -0.2621,-2.4896 7.2739,4.3896 11.73,12.2515 11.7955,20.7686 0,13.3651 -10.8126,24.2407 -24.2464,24.2407 z"
+     style="display:none;fill:#fcfcfc;stroke-width:0.492719"
+     id="path3544"
+     inkscape:label="dark-icon" /><path
+     id="path3499"
+     style="display:none;opacity:0.5;fill:#0f0f0d;stroke-width:0.492611"
+     d="m 32.000049,2.0000245 c -16.542118,0 -30.0000489,13.4578825 -30.0000489,29.9999515 0,16.542069 13.4579309,30 30.0000489,30 C 48.542168,61.999976 62,48.541946 62,31.999976 62,15.458005 48.542217,2.0000245 32.000049,2.0000245 Z m 0,57.4758135 c -15.143596,0 -27.4637435,-12.325715 -27.4637435,-27.475813 0,-15.150099 12.3201975,-27.4758626 27.4637435,-27.4758626 15.143547,0 27.463646,12.3255666 27.463646,27.4758136 0,15.150246 -12.32005,27.475812 -27.463646,27.475812 z M 43.893448,12.127414 c 0.187784,0.813941 0.250394,1.565271 0.250394,2.379163 0,4.820936 -2.879458,9.015812 -6.948226,10.956699 l -0.313005,5.13399 3.693202,3.69399 -3.693202,3.693991 2.441281,2.441773 -2.441281,2.441773 0.313005,4.570493 -5.195517,5.196601 -5.195518,-5.196601 v -21.97601 c -4.131379,-1.940887 -6.948226,-6.135763 -6.948226,-10.956699 0,-0.813941 0.125172,-1.565271 0.250394,-2.379163 -7.010788,4.194828 -11.2673891,11.70803 -11.2673891,19.847291 0,12.834975 10.3910341,23.165566 23.1607391,23.165566 12.832315,0 23.160739,-10.393202 23.160739,-23.165566 -0.06261,-8.139261 -4.319163,-15.652414 -11.26739,-19.847291 z m -11.893399,2.379212 c 2.37867,0 4.319163,-1.940887 4.319163,-4.320099 0,-0.3130544 -0.06261,-0.6260594 -0.125222,-0.9391134 C 34.816847,8.9969706 33.439754,8.8091376 32,8.8717486 c -1.377143,0 -2.816847,0.125222 -4.19399,0.375665 -0.06261,0.313054 -0.125222,0.626108 -0.125222,0.9391134 0,2.379163 1.940493,4.320099 4.319163,4.320099 z M 28.557291,28.343374 H 30.31 v 17.342907 h -1.752709 z"
+     inkscape:label="light-icon-inactive" /><path
+     id="path3480"
+     style="display:none;fill:#0f0f0d;stroke-width:0.492611"
+     d="m 32.000049,2.0000245 c -16.542118,0 -30.0000489,13.4578825 -30.0000489,29.9999515 0,16.542069 13.4579309,30 30.0000489,30 C 48.542168,61.999976 62,48.541946 62,31.999976 62,15.458005 48.542217,2.0000245 32.000049,2.0000245 Z m 0,57.4758135 c -15.143596,0 -27.4637435,-12.325715 -27.4637435,-27.475813 0,-15.150099 12.3201975,-27.4758626 27.4637435,-27.4758626 15.143547,0 27.463646,12.3255666 27.463646,27.4758136 0,15.150246 -12.32005,27.475812 -27.463646,27.475812 z M 43.893448,12.127414 c 0.187784,0.813941 0.250394,1.565271 0.250394,2.379163 0,4.820936 -2.879458,9.015812 -6.948226,10.956699 l -0.313005,5.13399 3.693202,3.69399 -3.693202,3.693991 2.441281,2.441773 -2.441281,2.441773 0.313005,4.570493 -5.195517,5.196601 -5.195518,-5.196601 v -21.97601 c -4.131379,-1.940887 -6.948226,-6.135763 -6.948226,-10.956699 0,-0.813941 0.125172,-1.565271 0.250394,-2.379163 -7.010788,4.194828 -11.2673891,11.70803 -11.2673891,19.847291 0,12.834975 10.3910341,23.165566 23.1607391,23.165566 12.832315,0 23.160739,-10.393202 23.160739,-23.165566 -0.06261,-8.139261 -4.319163,-15.652414 -11.26739,-19.847291 z m -11.893399,2.379212 c 2.37867,0 4.319163,-1.940887 4.319163,-4.320099 0,-0.3130544 -0.06261,-0.6260594 -0.125222,-0.9391134 C 34.816847,8.9969706 33.439754,8.8091376 32,8.8717486 c -1.377143,0 -2.816847,0.125222 -4.19399,0.375665 -0.06261,0.313054 -0.125222,0.626108 -0.125222,0.9391134 0,2.379163 1.940493,4.320099 4.319163,4.320099 z M 28.557291,28.343374 H 30.31 v 17.342907 h -1.752709 z"
+     inkscape:label="light-icon" /><g
+     stroke="#0c0c0c"
+     stroke-opacity="0.8"
+     id="g597"
+     inkscape:label="badges"
+     style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><g
+       inkscape:groupmode="layer"
+       id="g541"
+       inkscape:label="new"
+       style="display:inline;stroke:#34220a;stroke-width:0.845541;stroke-opacity:1"><path
+         d="M 17.0002,32.9999 C 15.7333,32.9581 13.5087,22.004 12.6124,21.108 11.7414,20.2369 0.959458,18.2313 1.00016,17.0002 1.04196,15.7333 11.9959,13.5087 12.8921,12.6123 c 0.871,-0.8709 2.8767,-11.652848 4.1076,-11.61214 1.267,0.04179 3.4916,10.99584 4.3879,11.89194 0.871,0.8709 11.653,2.8767 11.6122,4.1077 -0.0417,1.267 -10.9957,3.4915 -11.8919,4.3878 -0.871,0.871 -2.8766,11.6529 -4.1076,11.6123 z"
+         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"
+         id="path539" /></g><g
+       inkscape:groupmode="layer"
+       id="g587"
+       inkscape:label="cross"
+       style="display:none;stroke:#34220a;stroke-width:1;stroke-opacity:1"><rect
+         x="35.681992"
+         y="35.681427"
+         width="28"
+         height="28"
+         ry="3.0687625"
+         display="inline"
+         fill="#e54835"
+         stroke="none"
+         id="rect583"
+         style="display:inline;stroke:#4b110a;stroke-width:1.99937;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         inkscape:label="box"
+         transform="translate(-0.681992,-0.681427)" /><path
+         d="m 42.7432,42.7334 12.5136,12.5332 m 0,-12.5332 -12.5136,12.5332"
+         display="inline"
+         fill="#ffffff"
+         stroke="#ffffff"
+         stroke-linecap="round"
+         stroke-opacity="1"
+         id="path585"
+         style="display:inline;stroke:#ffffff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
+       inkscape:groupmode="layer"
+       id="g575"
+       inkscape:label="locked"
+       style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><path
+         d="m 56.181,36.3796 v -2.7424 c 0,-7.235 -7.5516,-12.6949 -15.2189,-8.9553 -3.185,1.5534 -5.1426,4.8538 -5.1426,8.3937 v 3.304 c -2.1434,0.3344 -3.8179,2.2073 -3.8179,4.4145 v 14.7568 c 0,1.898 1.5408,3.4366 3.4414,3.4366 h 21.1139 c 1.9006,0 3.4412,-1.5387 3.4412,-3.4366 V 40.7941 c 0,-2.2072 -1.6743,-4.0801 -3.8176,-4.4145 z m -6.229,0 h -7.8363 v -3.9961 c 0,-1.0327 0.5294,-2.0031 1.4094,-2.5453 3.229,-1.9899 6.4271,0.2964 6.4271,3.1971 v 3.3443 z"
+         display="inline"
+         fill="#eaa74b"
+         stroke="none"
+         id="path573"
+         style="display:inline;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g><g
+       inkscape:groupmode="layer"
+       id="g5131"
+       inkscape:label="locked-colored"
+       style="display:inline;stroke:#34220a;stroke-width:1;stroke-opacity:1"><path
+         d="m 56.181,36.3796 v -2.7424 c 0,-7.235 -7.5516,-12.6949 -15.2189,-8.9553 -3.185,1.5534 -5.1426,4.8538 -5.1426,8.3937 v 3.304 c -2.1434,0.3344 -3.8179,2.2073 -3.8179,4.4145 v 14.7568 c 0,1.898 1.5408,3.4366 3.4414,3.4366 h 21.1139 c 1.9006,0 3.4412,-1.5387 3.4412,-3.4366 V 40.7941 c 0,-2.2072 -1.6743,-4.0801 -3.8176,-4.4145 z m -6.229,0 h -7.8363 v -3.9961 c 0,-1.0327 0.5294,-2.0031 1.4094,-2.5453 3.229,-1.9899 6.4271,0.2964 6.4271,3.1971 v 3.3443 z"
+         display="inline"
+         fill="#eaa74b"
+         stroke="none"
+         id="path5129"
+         style="display:inline;fill:url(#linearGradient5490);fill-opacity:1;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" /></g><g
+       inkscape:groupmode="layer"
+       id="g521"
+       inkscape:label="questionmark"
+       style="display:none;stroke:#34220a;stroke-width:1;stroke-opacity:1"><rect
+         x="34.499676"
+         y="22.816805"
+         width="23.999998"
+         height="34"
+         ry="3.7263105"
+         display="inline"
+         fill="#e54835"
+         stroke="none"
+         id="rect517"
+         style="display:inline;stroke:#4b110a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         transform="translate(4.50033,6.1832)" /><path
+         d="m 48.294,49.5341 v -1.0762 c 0,-0.9308 0.1986,-1.7404 0.5958,-2.4288 0.3971,-0.6884 1.1236,-1.4204 2.1795,-2.1961 1.017,-0.7271 1.6854,-1.3186 2.0051,-1.7743 0.3293,-0.4557 0.494,-0.9647 0.494,-1.527 0,-0.6303 -0.2325,-1.1102 -0.6974,-1.4399 -0.465,-0.3296 -1.114,-0.4944 -1.9471,-0.4944 -1.4529,0 -3.1094,0.4751 -4.9692,1.4252 l -1.5838,-3.185 c 2.1602,-1.212 4.451,-1.818 6.8727,-1.818 1.9955,0 3.5793,0.48 4.7514,1.4399 1.1818,0.9598 1.7727,2.2396 1.7727,3.8395 0,1.0665 -0.2422,1.9876 -0.7265,2.7632 -0.4843,0.7757 -1.4046,1.6483 -2.7607,2.6178 -0.93,0.6884 -1.5208,1.212 -1.7727,1.5708 -0.2422,0.3587 -0.3632,0.8289 -0.3632,1.4107 v 0.8726 z m -0.465,4.9739 c 0,-0.8145 0.218,-1.4302 0.6539,-1.8471 0.4359,-0.4169 1.0704,-0.6253 1.9034,-0.6253 0.804,0 1.424,0.2133 1.8599,0.6399 0.4456,0.4266 0.6684,1.0374 0.6684,1.8325 0,0.7659 -0.2228,1.3719 -0.6684,1.8179 -0.4456,0.4363 -1.0655,0.6545 -1.8599,0.6545 -0.8137,0 -1.4433,-0.2134 -1.8888,-0.64 C 48.0518,55.9041 47.829,55.2933 47.829,54.508 Z"
+         display="inline"
+         fill="#ffffff"
+         stroke="#ffffff"
+         stroke-linecap="round"
+         stroke-opacity="1"
+         id="path519"
+         style="display:inline;stroke:#ffffff;stroke-width:0.869436;stroke-opacity:1" /></g><g
+       inkscape:groupmode="layer"
+       id="g689"
+       inkscape:label="bang"
+       style="display:none;stroke:#34220a;stroke-width:1;stroke-opacity:1"
+       sodipodi:insensitive="true"><rect
+         x="39.154316"
+         y="22.698513"
+         width="19.998899"
+         height="34.03849"
+         ry="3.7306192"
+         display="inline"
+         fill="#e54835"
+         stroke="none"
+         style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+         id="rect685"
+         inkscape:label="box"
+         transform="matrix(1,0,0,0.998901,3.84623,6.32587)" /><path
+         d="M 54.8115,49.4407 H 51.2243 L 50.4746,34.9821 h 5.0866 z m -4.3957,5.0612 c 0,-0.8287 0.2205,-1.4552 0.6616,-1.8795 0.441,-0.4241 1.0829,-0.6363 1.9258,-0.6363 0.8135,0 1.4408,0.2171 1.8818,0.6512 0.4508,0.4341 0.6762,1.0556 0.6762,1.8646 0,0.7795 -0.2254,1.3961 -0.6762,1.85 -0.4509,0.4439 -1.0781,0.666 -1.8818,0.666 -0.8232,0 -1.4603,-0.2172 -1.9112,-0.6512 -0.4508,-0.444 -0.6762,-1.0657 -0.6762,-1.8648 z"
+         display="inline"
+         fill="#ffffff"
+         stroke="#ffffff"
+         stroke-opacity="1"
+         id="path687"
+         style="display:inline;stroke:#ffffff;stroke-width:0.868522;stroke-opacity:1" /></g></g></svg>
diff --git a/keepassxc-browser/_locales/en/messages.json b/keepassxc-browser/_locales/en/messages.json
index 0c05297..b61158d 100644
--- a/keepassxc-browser/_locales/en/messages.json
+++ b/keepassxc-browser/_locales/en/messages.json
@@ -679,6 +679,10 @@
         "message": "Show notifications.",
         "description": "Show notifications checkbox text."
     },
+    "optionsCheckboxUseMonochromeToolbarIcon": {
+        "message": "Use monochrome toolbar icon.",
+        "description": "Use monochrome toolbar icon checkbox text."
+    },
     "optionsSaveDomainOnly": {
         "message": "Save domain only.",
         "description": "Save domain only checkbox text."
@@ -811,6 +815,10 @@
         "message": "Show notifications for errors and when user interaction is required.",
         "description": "Show notifications option help text."
     },
+    "optionsUseMonochromeToolbarIconHelpText": {
+        "message": "Use a monochrome icon with colored badges in toolbar that adapts to light/dark browser theme.",
+        "description": "Use monochrome toolbar icon option help text."
+    },
     "optionsSaveDomainOnlyHelpText": {
         "message": "When saving new credentials, save only the domain instead of full URL.",
         "description": "Save domain only option help text."
diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js
index d724eaa..00e2c60 100755
--- a/keepassxc-browser/background/browserAction.js
+++ b/keepassxc-browser/background/browserAction.js
@@ -52,8 +52,17 @@ browserAction.generateIconName = function(iconType) {
     let name = 'icon_';
     name += (keepass.keePassXCUpdateAvailable()) ? 'new_' : '';
     name += (!iconType || iconType === 'normal') ? 'normal' : iconType;
-
-    return `/icons/toolbar/${name}.png`;
+    
+    let style = 'colored'
+    if (page.settings.useMonochromeToolbarIcon) {
+        if (page.settings.colorTheme == 'system') {
+            style = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+       } else {
+            style = page.settings.colorTheme; 
+       }
+    }
+    let filetype = (isFirefox() ? 'svg' : 'png')
+    return `/icons/toolbar/${style}/${name}.${filetype}`;
 };
 
 browserAction.ignoreSite = async function(url) {
diff --git a/keepassxc-browser/background/event.js b/keepassxc-browser/background/event.js
index 14bd0b2..160869b 100755
--- a/keepassxc-browser/background/event.js
+++ b/keepassxc-browser/background/event.js
@@ -277,5 +277,6 @@ kpxcEvent.messageHandlers = {
     'username_field_detected': kpxcEvent.onUsernameFieldDetected,
     'save_settings': kpxcEvent.onSaveSettings,
     'update_available_keepassxc': kpxcEvent.onUpdateAvailableKeePassXC,
-    'update_context_menu': page.updateContextMenu
+    'update_context_menu': page.updateContextMenu,
+    'update_popup': page.updatePopup
 };
diff --git a/keepassxc-browser/background/page.js b/keepassxc-browser/background/page.js
index f15c2b1..a59aa78 100755
--- a/keepassxc-browser/background/page.js
+++ b/keepassxc-browser/background/page.js
@@ -25,6 +25,7 @@ const defaultSettings = {
     showLoginFormIcon: true,
     showLoginNotifications: true,
     showNotifications: true,
+    useMonochromeToolbarIcon: false,
     showOTPIcon: true,
     useObserver: true,
     usePredefinedSites: true,
@@ -322,6 +323,10 @@ page.updateContextMenu = async function(tab, credentials) {
     }
 };
 
+page.updatePopup = function(tab) {
+    browserAction.showDefault(tab);
+}
+
 const createContextMenuItem = function({ action, args, ...options }) {
     return browser.contextMenus.create({
         contexts: menuContexts,
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_bang.png b/keepassxc-browser/icons/toolbar/colored/icon_bang.png
new file mode 100644
index 0000000..f8df5b4
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_bang.svg b/keepassxc-browser/icons/toolbar/colored/icon_bang.svg
new file mode 100644
index 0000000..1c36e09
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_bang.svg
@@ -0,0 +1 @@
+<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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_cross.png b/keepassxc-browser/icons/toolbar/colored/icon_cross.png
new file mode 100644
index 0000000..be64214
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_cross.svg b/keepassxc-browser/icons/toolbar/colored/icon_cross.svg
new file mode 100644
index 0000000..347b198
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_cross.svg
@@ -0,0 +1 @@
+<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:#464646;stop-opacity:1"/><stop offset="1" style="stop-color:#adadad;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="b" gradientUnits="userSpaceOnUse" x1="53.24" y1="12.75" x2="53.24" y2="86.36"/></defs><g style="display:inline" transform="translate(.42 .42) scale(.63158)"><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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:1.99937;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_dark.png b/keepassxc-browser/icons/toolbar/colored/icon_dark.png
new file mode 100644
index 0000000..c0f765f
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_dark.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_dark.svg b/keepassxc-browser/icons/toolbar/colored/icon_dark.svg
new file mode 100644
index 0000000..72b8673
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_dark.svg
@@ -0,0 +1 @@
+<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:#464646;stop-opacity:1"/><stop offset="1" style="stop-color:#adadad;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="b" gradientUnits="userSpaceOnUse" x1="53.24" y1="12.75" x2="53.24" y2="86.36"/></defs><g style="display:inline" transform="translate(.42 .42) scale(.63158)"><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></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_locked.png b/keepassxc-browser/icons/toolbar/colored/icon_locked.png
new file mode 100644
index 0000000..6b7d0d1
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_locked.svg b/keepassxc-browser/icons/toolbar/colored/icon_locked.svg
new file mode 100644
index 0000000..e852fc3
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_locked.svg
@@ -0,0 +1 @@
+<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 style="stop-color:#eaa74b;stop-opacity:1" offset="0"/><stop style="stop-color:#a3703c;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="b"><stop offset="0" style="stop-color:#464646;stop-opacity:1"/><stop offset="1" style="stop-color:#adadad;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="d" x1="39.43" y1="42.25" x2="57.97" y2="56.88" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="c" gradientUnits="userSpaceOnUse" x1="53.24" y1="12.75" x2="53.24" y2="86.36"/></defs><g style="display:inline" transform="translate(.42 .42) scale(.63158)"><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(#c);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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;fill:url(#d);fill-opacity:1;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_bang.png b/keepassxc-browser/icons/toolbar/colored/icon_new_bang.png
new file mode 100644
index 0000000..26c4cae
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_new_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_bang.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_bang.svg
new file mode 100644
index 0000000..897ce35
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_new_bang.svg
@@ -0,0 +1 @@
+<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 stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke:#34220a;stroke-width:1;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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_cross.png b/keepassxc-browser/icons/toolbar/colored/icon_new_cross.png
new file mode 100644
index 0000000..56f9dd9
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_new_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_cross.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_cross.svg
new file mode 100644
index 0000000..d07cc55
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_new_cross.svg
@@ -0,0 +1 @@
+<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:#464646;stop-opacity:1"/><stop offset="1" style="stop-color:#adadad;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="b" gradientUnits="userSpaceOnUse" x1="53.24" y1="12.75" x2="53.24" y2="86.36"/></defs><g style="display:inline" transform="translate(.42 .42) scale(.63158)"><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 stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke:#34220a;stroke-width:1;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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:1.99937;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_locked.png b/keepassxc-browser/icons/toolbar/colored/icon_new_locked.png
new file mode 100644
index 0000000..71f2ed5
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_new_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_locked.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_locked.svg
new file mode 100644
index 0000000..c35bd88
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_new_locked.svg
@@ -0,0 +1 @@
+<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 style="stop-color:#eaa74b;stop-opacity:1" offset="0"/><stop style="stop-color:#a3703c;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="b"><stop offset="0" style="stop-color:#464646;stop-opacity:1"/><stop offset="1" style="stop-color:#adadad;stop-opacity:1"/></linearGradient><linearGradient xlink:href="#a" id="d" x1="39.43" y1="42.25" x2="57.97" y2="56.88" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="c" gradientUnits="userSpaceOnUse" x1="53.24" y1="12.75" x2="53.24" y2="86.36"/></defs><g style="display:inline" transform="translate(.42 .42) scale(.63158)"><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(#c);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 stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke:#34220a;stroke-width:1;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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;fill:url(#d);fill-opacity:1;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_normal.png b/keepassxc-browser/icons/toolbar/colored/icon_new_normal.png
new file mode 100644
index 0000000..0324d77
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_new_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_normal.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_normal.svg
new file mode 100644
index 0000000..4f8c420
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_new_normal.svg
@@ -0,0 +1 @@
+<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"><g style="display:inline;stroke:#34220a;stroke-width:.845541;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><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></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png
new file mode 100644
index 0000000..22877a0
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg
new file mode 100644
index 0000000..61bfe20
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_new_questionmark.svg
@@ -0,0 +1 @@
+<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_normal.png b/keepassxc-browser/icons/toolbar/colored/icon_normal.png
new file mode 100644
index 0000000..9663afe
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_normal.svg b/keepassxc-browser/icons/toolbar/colored/icon_normal.svg
new file mode 100644
index 0000000..cdc6fa5
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_normal.svg
@@ -0,0 +1 @@
+<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></svg>
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png
new file mode 100644
index 0000000..d043eb1
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg
new file mode 100644
index 0000000..d2e4c03
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/colored/icon_questionmark.svg
@@ -0,0 +1 @@
+<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_bang.png b/keepassxc-browser/icons/toolbar/dark/icon_bang.png
new file mode 100644
index 0000000..0403f02
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_bang.svg b/keepassxc-browser/icons/toolbar/dark/icon_bang.svg
new file mode 100644
index 0000000..110db23
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_bang.svg
@@ -0,0 +1 @@
+<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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_cross.png b/keepassxc-browser/icons/toolbar/dark/icon_cross.png
new file mode 100644
index 0000000..009326c
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_cross.svg b/keepassxc-browser/icons/toolbar/dark/icon_cross.svg
new file mode 100644
index 0000000..017ead9
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_cross.svg
@@ -0,0 +1 @@
+<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;opacity:.5;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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_dark.png b/keepassxc-browser/icons/toolbar/dark/icon_dark.png
new file mode 100644
index 0000000..eb3f705
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_dark.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_dark.svg b/keepassxc-browser/icons/toolbar/dark/icon_dark.svg
new file mode 100644
index 0000000..b2b096d
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_dark.svg
@@ -0,0 +1 @@
+<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;opacity:.5;fill:#fcfcfc;stroke-width:.492719"/></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_locked.png b/keepassxc-browser/icons/toolbar/dark/icon_locked.png
new file mode 100644
index 0000000..2a92f37
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_locked.svg b/keepassxc-browser/icons/toolbar/dark/icon_locked.svg
new file mode 100644
index 0000000..0f47f1d
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_locked.svg
@@ -0,0 +1 @@
+<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;opacity:.5;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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_bang.png b/keepassxc-browser/icons/toolbar/dark/icon_new_bang.png
new file mode 100644
index 0000000..217cc1e
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_new_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_bang.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_bang.svg
new file mode 100644
index 0000000..ce1db58
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_new_bang.svg
@@ -0,0 +1 @@
+<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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_cross.png b/keepassxc-browser/icons/toolbar/dark/icon_new_cross.png
new file mode 100644
index 0000000..f297383
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_new_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_cross.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_cross.svg
new file mode 100644
index 0000000..d388b06
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_new_cross.svg
@@ -0,0 +1 @@
+<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;opacity:.5;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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_locked.png b/keepassxc-browser/icons/toolbar/dark/icon_new_locked.png
new file mode 100644
index 0000000..c7dca8a
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_new_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_locked.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_locked.svg
new file mode 100644
index 0000000..e150ec2
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_new_locked.svg
@@ -0,0 +1 @@
+<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;opacity:.5;fill:#fcfcfc;stroke-width:.492719"/><g stroke="#0c0c0c" stroke-opacity=".8" style="display:inline;stroke:#34220a;stroke-width:1;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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_normal.png b/keepassxc-browser/icons/toolbar/dark/icon_new_normal.png
new file mode 100644
index 0000000..9d5cd5f
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_new_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_normal.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_normal.svg
new file mode 100644
index 0000000..55172d8
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_new_normal.svg
@@ -0,0 +1 @@
+<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:.845541;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><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></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png
new file mode 100644
index 0000000..6563b49
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg
new file mode 100644
index 0000000..61fc1dc
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_new_questionmark.svg
@@ -0,0 +1 @@
+<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_normal.png b/keepassxc-browser/icons/toolbar/dark/icon_normal.png
new file mode 100644
index 0000000..bd96507
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_normal.svg b/keepassxc-browser/icons/toolbar/dark/icon_normal.svg
new file mode 100644
index 0000000..6863c0d
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_normal.svg
@@ -0,0 +1 @@
+<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"/></svg>
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png
new file mode 100644
index 0000000..9a25bb5
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg
new file mode 100644
index 0000000..5900d06
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/dark/icon_questionmark.svg
@@ -0,0 +1 @@
+<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/icon_bang.png b/keepassxc-browser/icons/toolbar/icon_bang.png
deleted file mode 100644
index 18030b1..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_bang.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_cross.png b/keepassxc-browser/icons/toolbar/icon_cross.png
deleted file mode 100644
index 5e6b16d..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_cross.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_dark.png b/keepassxc-browser/icons/toolbar/icon_dark.png
deleted file mode 100644
index 62b8479..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_dark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_locked.png b/keepassxc-browser/icons/toolbar/icon_locked.png
deleted file mode 100644
index 3f4f112..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_locked.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_new_bang.png b/keepassxc-browser/icons/toolbar/icon_new_bang.png
deleted file mode 100644
index b3cad15..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_new_bang.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_new_cross.png b/keepassxc-browser/icons/toolbar/icon_new_cross.png
deleted file mode 100644
index c6080be..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_new_cross.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_new_locked.png b/keepassxc-browser/icons/toolbar/icon_new_locked.png
deleted file mode 100644
index f3152a5..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_new_locked.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_new_normal.png b/keepassxc-browser/icons/toolbar/icon_new_normal.png
deleted file mode 100644
index 56e03c4..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_new_normal.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/icon_new_questionmark.png
deleted file mode 100644
index 9981d5b..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_new_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_normal.png b/keepassxc-browser/icons/toolbar/icon_normal.png
deleted file mode 100644
index 2956b93..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_normal.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/icon_questionmark.png b/keepassxc-browser/icons/toolbar/icon_questionmark.png
deleted file mode 100644
index 40941a6..0000000
Binary files a/keepassxc-browser/icons/toolbar/icon_questionmark.png and /dev/null differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_bang.png b/keepassxc-browser/icons/toolbar/light/icon_bang.png
new file mode 100644
index 0000000..a13065e
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_bang.svg b/keepassxc-browser/icons/toolbar/light/icon_bang.svg
new file mode 100644
index 0000000..fbcb8bf
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_bang.svg
@@ -0,0 +1 @@
+<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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_cross.png b/keepassxc-browser/icons/toolbar/light/icon_cross.png
new file mode 100644
index 0000000..d489f5c
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_cross.svg b/keepassxc-browser/icons/toolbar/light/icon_cross.svg
new file mode 100644
index 0000000..bdfbc07
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_cross.svg
@@ -0,0 +1 @@
+<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;opacity:.5;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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_dark.png b/keepassxc-browser/icons/toolbar/light/icon_dark.png
new file mode 100644
index 0000000..ac9fbb8
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_dark.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_dark.svg b/keepassxc-browser/icons/toolbar/light/icon_dark.svg
new file mode 100644
index 0000000..cd1a53e
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_dark.svg
@@ -0,0 +1 @@
+<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;opacity:.5;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"/></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_locked.png b/keepassxc-browser/icons/toolbar/light/icon_locked.png
new file mode 100644
index 0000000..e50da84
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_locked.svg b/keepassxc-browser/icons/toolbar/light/icon_locked.svg
new file mode 100644
index 0000000..5296e34
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_locked.svg
@@ -0,0 +1 @@
+<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;opacity:.5;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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_bang.png b/keepassxc-browser/icons/toolbar/light/icon_new_bang.png
new file mode 100644
index 0000000..e684d95
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_new_bang.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_bang.svg b/keepassxc-browser/icons/toolbar/light/icon_new_bang.svg
new file mode 100644
index 0000000..16381a2
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_new_bang.svg
@@ -0,0 +1 @@
+<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="39.15" y="22.7" width="20" height="34.04" ry="3.73" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2.0011;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="matrix(1 0 0 .9989 3.85 6.33)"/><path d="M54.81 49.44h-3.59l-.75-14.46h5.1zm-4.4 5.06c0-.83.23-1.45.67-1.88.44-.42 1.08-.63 1.92-.63.82 0 1.44.21 1.89.65.45.43.67 1.05.67 1.86 0 .78-.22 1.4-.67 1.85-.46.45-1.08.67-1.89.67-.82 0-1.46-.22-1.9-.65a2.5 2.5 0 0 1-.68-1.87z" display="inline" fill="#fff" stroke="#fff" style="display:inline;stroke:#fff;stroke-width:.868522;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_cross.png b/keepassxc-browser/icons/toolbar/light/icon_new_cross.png
new file mode 100644
index 0000000..ae0dee6
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_new_cross.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_cross.svg b/keepassxc-browser/icons/toolbar/light/icon_new_cross.svg
new file mode 100644
index 0000000..30ccc2b
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_new_cross.svg
@@ -0,0 +1 @@
+<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;opacity:.5;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="35.68" y="35.68" width="28" height="28" ry="3.07" display="inline" fill="#e54835" stroke="none" style="display:inline;stroke:#4b110a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" transform="translate(-.68 -.68)"/><path d="m42.74 42.73 12.52 12.54m0-12.54L42.74 55.27" display="inline" fill="#fff" stroke="#fff" stroke-linecap="round" style="display:inline;stroke:#fff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_locked.png b/keepassxc-browser/icons/toolbar/light/icon_new_locked.png
new file mode 100644
index 0000000..811c531
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_new_locked.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_locked.svg b/keepassxc-browser/icons/toolbar/light/icon_new_locked.svg
new file mode 100644
index 0000000..87e6aab
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_new_locked.svg
@@ -0,0 +1 @@
+<svg height="64" width="64" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path style="display:inline;opacity:.5;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"><path d="M56.18 36.38v-2.74c0-7.24-7.55-12.7-15.22-8.96a9.3 9.3 0 0 0-5.14 8.4v3.3A4.52 4.52 0 0 0 32 40.79v14.76c0 1.9 1.54 3.44 3.44 3.44h21.12c1.9 0 3.44-1.54 3.44-3.44V40.8c0-2.2-1.68-4.08-3.82-4.41zm-6.23 0h-7.83v-4a3 3 0 0 1 1.4-2.54c3.23-2 6.43.3 6.43 3.2v3.34z" display="inline" fill="#eaa74b" stroke="none" style="display:inline;stroke:#34220a;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"/></g></g></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_normal.png b/keepassxc-browser/icons/toolbar/light/icon_new_normal.png
new file mode 100644
index 0000000..0d2a018
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_new_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_normal.svg b/keepassxc-browser/icons/toolbar/light/icon_new_normal.svg
new file mode 100644
index 0000000..0029821
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_new_normal.svg
@@ -0,0 +1 @@
+<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:.845541;stroke-opacity:1" stroke="#0c0c0c" stroke-opacity=".8"><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></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png
new file mode 100644
index 0000000..3873dad
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg
new file mode 100644
index 0000000..295643c
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_new_questionmark.svg
@@ -0,0 +1 @@
+<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_normal.png b/keepassxc-browser/icons/toolbar/light/icon_normal.png
new file mode 100644
index 0000000..2f345f5
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_normal.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_normal.svg b/keepassxc-browser/icons/toolbar/light/icon_normal.svg
new file mode 100644
index 0000000..016c63c
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_normal.svg
@@ -0,0 +1 @@
+<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"/></svg>
diff --git a/keepassxc-browser/icons/toolbar/light/icon_questionmark.png b/keepassxc-browser/icons/toolbar/light/icon_questionmark.png
new file mode 100644
index 0000000..eb83d9c
Binary files /dev/null and b/keepassxc-browser/icons/toolbar/light/icon_questionmark.png differ
diff --git a/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg b/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg
new file mode 100644
index 0000000..d443976
--- /dev/null
+++ b/keepassxc-browser/icons/toolbar/light/icon_questionmark.svg
@@ -0,0 +1 @@
+<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>
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index fe64655..f000033 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -133,6 +133,15 @@
                       <div class="form-text" data-i18n="optionsShowNotificationsHelpText"></div>
                     </div>
                   </div>
+                  
+                  <!-- Use monochrome toolbar icons -->
+                  <div class="form-group">
+                    <div class="form-check">
+                      <input class="form-check-input" type="checkbox" name="useMonochromeToolbarIcon" id="useMonochromeToolbarIconCheckBox" value="true">
+                      <label class="form-check-label" for="useMonochromeToolbarIcon" data-i18n="optionsCheckboxUseMonochromeToolbarIcon"></label>
+                      <div class="form-text" data-i18n="optionsUseMonochromeToolbarIconHelpText"></div>
+                    </div>
+                  </div>
                 </div>
               </div>
 
diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index a629b8b..1db8bd9 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -93,6 +93,8 @@ options.initGeneralSettings = function() {
         } else if (name === 'autoReconnect') {
             const message = updated.autoReconnect ? 'enable_automatic_reconnect' : 'disable_automatic_reconnect';
             browser.runtime.sendMessage({ action: message });
+        } else if (name === 'useMonochromeToolbarIcon') {
+            browser.runtime.sendMessage({ action: 'update_popup' });
         }
     };