Improve colorful lock icon for system tray (#9632)

* Fix #9432
* Simplify tray icon selection code
* Update all icons with latest export
* Fix MIME type icon appearance on KDE
---------
Co-authored-by: Janek Bevendorff <janek@keepassxc.org>

share/branding/scalable/keepassxc-monochrome-dark.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#0f0f0d;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#0f0f0d;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#0f0f0d;"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#0f0f0d; stroke-width:0px;"/></g></g></svg>

share/branding/scalable/keepassxc-monochrome-light.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><path d="m64.0001,3.1C30.4344,3.1,3.1267,30.4196,3.1267,64s27.3077,60.9,60.8733,60.9,60.873-27.3199,60.873-60.9S97.5657,3.1,64.0001,3.1Zm-8.5138,14.7123c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5137.7626.1271.6355.2542,1.2709.2542,1.9064,0,4.8298-3.9393,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Zm5.0829,38.7648v35.2061h-3.558v-35.2061h3.558Zm3.4309,56.4242c-27.1257,0-49.1986-21.9445-49.1986-49.2088,0-17.2897,9.0419-33.2493,23.9344-42.16-.2659,1.7289-.5318,3.3249-.5318,5.0539,0,10.2407,5.9835,19.1515,14.7595,23.2744v46.6819l11.0365,11.0387,11.0364-11.0387-.6648-9.7088,5.1858-5.1869-5.1858-5.1869,7.8452-7.8468-7.8452-7.8468.6648-10.9057c8.643-4.1229,14.7596-13.0337,14.7596-23.2744,0-1.729-.133-3.325-.5319-5.0539,14.7596,8.9108,23.8015,24.8704,23.9344,42.1601,0,27.1313-21.9399,49.2088-49.1985,49.2088Z" style="fill:#fcfcfc; stroke-width:0px;"/></g></svg>

share/branding/scalable/macos-monochrome-dark.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128"><defs><filter id="d"><feGaussianBlur in="SourceGraphic" stdDeviation="3"/></filter><linearGradient id="g" x1="63.9998" y1="12.5728" x2="63.9998" y2="115.4272" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#dbdbdb"/></linearGradient><linearGradient id="i" x1="63.9997" y1="20.4513" x2="63.9997" y2="107.5488" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000"/><stop offset="1" stop-color="#000" stop-opacity=".2"/></linearGradient></defs><g style="isolation:isolate;"><g id="b"><g id="c"><rect width="128" height="128" style="fill:none;"/><g id="e" style="filter:url(#d);"><rect x="12.5727" y="16.4869" width="102.8543" height="100.3513" rx="22.5532" ry="22.5532" style="opacity:.3;"/></g><g id="f"><rect x="12.5727" y="12.5728" width="102.8543" height="102.8543" rx="22.8327" ry="22.8327" style="fill:url(#g);"/><rect x="12.5727" y="12.5728" width="102.8543" height="102.8543" rx="22.8327" ry="22.8327" style="fill:none; mix-blend-mode:overlay; stroke:#b9b9b9; stroke-miterlimit:10; stroke-width:.1058px;"/></g><g id="h"><g style="opacity:.6;"><path d="m63.9998,20.8039c23.7037,0,42.9881,19.3777,42.9881,43.1962s-19.2844,43.1962-42.9881,43.1962-42.9883-19.3777-42.9883-43.1962S40.296,20.8039,63.9998,20.8039m0-.3525c-23.8983,0-43.3408,19.5358-43.3408,43.5487s19.4425,43.5487,43.3408,43.5487,43.3407-19.536,43.3407-43.5487-19.4424-43.5487-43.3407-43.5487h0Z" style="fill:url(#i);"/></g></g><path id="j" d="m63.9998,107.5c-23.9861,0-43.5001-19.5141-43.5001-43.5S40.0137,20.5,63.9998,20.5s43.4999,19.5139,43.4999,43.5-19.5138,43.5-43.4999,43.5Zm0-83.3399c-21.9582,0-39.8225,17.8721-39.8225,39.8399s17.8643,39.8399,39.8225,39.8399,39.8223-17.8723,39.8223-39.8399-17.8641-39.8399-39.8223-39.8399Z" style="fill:#0f0f0d;"/><path id="k" d="m63.9998,24.1601c-21.9679,0-39.84,17.8721-39.84,39.8399s17.8721,39.8399,39.84,39.8399,39.8399-17.8722,39.8399-39.8399-17.8719-39.8399-39.8399-39.8399Z" style="fill:#0f0f0d;"/><path id="l" d="m63.9998,24.1601c-21.9582,0-39.8225,17.8721-39.8225,39.8399s17.8643,39.8399,39.8225,39.8399,39.8223-17.8723,39.8223-39.8399-17.8641-39.8399-39.8223-39.8399Zm-6.0813,6.8487c1.9968-.3631,4.0844-.5447,6.0813-.5447,2.0876-.0908,4.0844.1815,6.0813.5447.0908.4539.1815.9078.1815,1.3617,0,3.4498-2.8137,6.2641-6.2628,6.2641s-6.2628-2.8143-6.2628-6.2641c0-.4539.0908-.9078.1815-1.3617Zm3.6306,27.6891v25.1472h-2.5414v-25.1472h2.5414Zm2.4507,38.8556c-18.5161,0-33.5831-14.9794-33.5831-33.5901,0-11.8019,6.172-22.696,16.3377-28.7786-.1815,1.1802-.3631,2.2696-.3631,3.4498,0,6.9903,4.0844,13.0729,10.0749,15.8872v31.8652l7.5335,7.5351,7.5335-7.5351-.4538-6.6272,3.5398-3.5406-3.5398-3.5406,5.3551-5.3563-5.3551-5.3563.4538-7.4443c5.8997-2.8143,10.0749-8.8968,10.0749-15.8872,0-1.1802-.0908-2.2696-.3631-3.4498,10.0749,6.0826,16.247,16.9766,16.3377,28.7786,0,18.5199-14.9763,33.5901-33.5831,33.5901Z" style="fill:#fcfcfc;"/></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128"><defs><filter id="d"><feGaussianBlur in="SourceGraphic" stdDeviation="3"/></filter><linearGradient id="g" x1="63.9998" y1="12.5728" x2="63.9998" y2="115.4272" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#dbdbdb"/></linearGradient><linearGradient id="i" x1="63.9997" y1="20.4513" x2="63.9997" y2="107.5488" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000"/><stop offset="1" stop-color="#000" stop-opacity=".2"/></linearGradient></defs><g style="isolation:isolate;"><g id="b"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="e" style="filter:url(#d);"><rect x="12.5727" y="16.4869" width="102.8543" height="100.3513" rx="22.5532" ry="22.5532" style="opacity:.3; stroke-width:0px;"/></g><g id="f"><rect x="12.5727" y="12.5728" width="102.8543" height="102.8543" rx="22.8327" ry="22.8327" style="fill:url(#g); stroke-width:0px;"/><rect x="12.5727" y="12.5728" width="102.8543" height="102.8543" rx="22.8327" ry="22.8327" style="fill:none; mix-blend-mode:overlay; stroke:#b9b9b9; stroke-miterlimit:10; stroke-width:.1058px;"/></g><g id="h"><g style="opacity:.6;"><path d="m63.9998,20.8039c23.7037,0,42.9881,19.3777,42.9881,43.1962s-19.2844,43.1962-42.9881,43.1962-42.9883-19.3777-42.9883-43.1962S40.296,20.8039,63.9998,20.8039m0-.3525c-23.8983,0-43.3408,19.5358-43.3408,43.5487s19.4425,43.5487,43.3408,43.5487,43.3407-19.536,43.3407-43.5487-19.4424-43.5487-43.3407-43.5487h0Z" style="fill:url(#i); stroke-width:0px;"/></g></g><path id="j" d="m63.9998,107.5c-23.9861,0-43.5001-19.5141-43.5001-43.5S40.0137,20.5,63.9998,20.5s43.4999,19.5139,43.4999,43.5-19.5138,43.5-43.4999,43.5Zm0-83.3399c-21.9582,0-39.8225,17.8721-39.8225,39.8399s17.8643,39.8399,39.8225,39.8399,39.8223-17.8723,39.8223-39.8399-17.8641-39.8399-39.8223-39.8399Z" style="fill:#0f0f0d; stroke-width:0px;"/><path id="k" d="m63.9998,24.1601c-21.9679,0-39.84,17.8721-39.84,39.8399s17.8721,39.8399,39.84,39.8399,39.8399-17.8722,39.8399-39.8399-17.8719-39.8399-39.8399-39.8399Z" style="fill:#0f0f0d; stroke-width:0px;"/><path id="l" d="m63.9998,24.1601c-21.9582,0-39.8225,17.8721-39.8225,39.8399s17.8643,39.8399,39.8225,39.8399,39.8223-17.8723,39.8223-39.8399-17.8641-39.8399-39.8223-39.8399Zm-6.0813,6.8487c1.9968-.3631,4.0844-.5447,6.0813-.5447,2.0876-.0908,4.0844.1815,6.0813.5447.0908.4539.1815.9078.1815,1.3617,0,3.4498-2.8137,6.2641-6.2628,6.2641s-6.2628-2.8143-6.2628-6.2641c0-.4539.0908-.9078.1815-1.3617Zm3.6306,27.6891v25.1472h-2.5414v-25.1472h2.5414Zm2.4507,38.8556c-18.5161,0-33.5831-14.9794-33.5831-33.5901,0-11.8019,6.172-22.696,16.3377-28.7786-.1815,1.1802-.3631,2.2696-.3631,3.4498,0,6.9903,4.0844,13.0729,10.0749,15.8872v31.8652l7.5335,7.5351,7.5335-7.5351-.4538-6.6272,3.5398-3.5406-3.5398-3.5406,5.3551-5.3563-5.3551-5.3563.4538-7.4443c5.8997-2.8143,10.0749-8.8968,10.0749-15.8872,0-1.1802-.0908-2.2696-.3631-3.4498,10.0749,6.0826,16.247,16.9766,16.3377,28.7786,0,18.5199-14.9763,33.5901-33.5831,33.5901Z" style="fill:#fcfcfc; stroke-width:0px;"/></g></g></g></svg>

share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none;"/><g><path d="m64,28.4885c4.8287,0,8.7679-3.9401,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9065-2.7955-.5084-5.5911-.8896-8.5138-.7625-2.7955,0-5.7182.2542-8.5137.7625-.1271.6356-.2542,1.271-.2542,1.9065,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d;"/><path d="m86.6088,58.0631c-1.8394,1.1351-2.9459,3.1661-2.9459,5.3275v8.3641h16.38v-7c0-6.0711-6.6846-10.8567-13.4341-6.6917Z" style="fill:#0f0f0d;"/><path d="m53.4531,50.7306c-8.3867-3.9401-14.1049-12.4556-14.1049-22.2421,0-1.6523.2542-3.1775.5083-4.8298-14.2319,8.5156-22.8728,23.7673-22.8728,40.29,0,24.1918,18.1885,43.989,41.5388,46.6983v-10.2347l-5.0693-5.0704v-44.6113Z" style="fill:#0f0f0d;"/><path d="m123.8043,75.4549c.7097-3.7126,1.0956-7.5386,1.0956-11.4548,0-33.5805-27.3193-60.9-60.8999-60.9S3.0999,30.4196,3.0999,64.0001s27.3196,60.9,60.9001,60.9c5.0994,0,10.0512-.6386,14.7881-1.8249l-9.0723.0002c-.3044,0-.6034-.0223-.9017-.0463.2983.024.5974.0457.9018.0457h44.1338c6.1719,0,11.1934-5.0205,11.1934-11.1924v-30.8877c0-1.9575-.4447-3.8377-1.2388-5.5397Zm-66.7931-18.8778v35.2061h1.5113v-10.7879c0-.3262.0132-.65.0375-.9714-.024.3212-.037.6448-.037.9707v30.8877c0,3.0512,1.2302,5.8181,3.2169,7.8391-.001-.001-.002-.0018-.003-.0028-29.6951-1.1935-53.4883-25.723-53.4883-55.7184,0-30.755,25.0099-55.7759,55.7514-55.7759s55.7512,25.0209,55.7512,55.7759c0,2.0822-.1242,4.1353-.3475,6.1589-.7296-.5236-1.5109-.9811-2.3406-1.3529v-2.791c0-8.027-3.7652-15.1869-9.6173-19.8212-3.8016-9.2543-10.4838-17.2112-19.3022-22.5352.3812,1.6523.5083,3.1774.5083,4.8297,0,4.8487-1.4382,9.3832-3.8906,13.2061.0031-.0009.0061-.0013.0092-.0022-1.7772.4825-3.5391,1.1374-5.2742,1.9848-7.8931,3.8555-12.9932,12.1621-12.9932,21.1621v3.9668c-2.4653,1.1048-4.5251,2.9335-5.937,5.1815.0011-.0017.002-.0035.0031-.0052v-17.4053h-3.5579Zm64.0317,55.3047c0,3.9725-3.2204,7.1929-7.193,7.1929h-44.134c-3.9726,0-7.193-3.2203-7.193-7.1929v-30.887c0-4.62,3.5-8.54,7.98-9.24v-6.9156c0-7.4088,4.0921-14.3167,10.7493-17.5682,16.0264-7.8276,31.8107,3.6011,31.8107,18.7438v5.74c4.48.7,7.98,4.62,7.98,9.24v30.887Z" style="fill:#0f0f0d;"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><path d="m64,28.4885c4.8287,0,8.7679-3.9401,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9065-2.7955-.5084-5.5911-.8896-8.5138-.7625-2.7955,0-5.7182.2542-8.5137.7625-.1271.6356-.2542,1.271-.2542,1.9065,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m86.6088,58.0631c-1.8394,1.1351-2.9459,3.1661-2.9459,5.3275v8.3641h16.38v-7c0-6.0711-6.6846-10.8567-13.4341-6.6917Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m53.4531,50.7306c-8.3867-3.9401-14.1049-12.4556-14.1049-22.2421,0-1.6523.2542-3.1775.5083-4.8298-14.2319,8.5156-22.8728,23.7673-22.8728,40.29,0,24.1918,18.1885,43.989,41.5388,46.6983v-10.2347l-5.0693-5.0704v-44.6113Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m123.8043,75.4549c.7097-3.7126,1.0956-7.5386,1.0956-11.4548,0-33.5805-27.3193-60.9-60.8999-60.9S3.0999,30.4196,3.0999,64.0001s27.3196,60.9,60.9001,60.9c5.0994,0,10.0512-.6386,14.7881-1.8249l-9.0723.0002c-.3044,0-.6034-.0223-.9017-.0463.2983.024.5974.0457.9018.0457h44.1338c6.1719,0,11.1934-5.0205,11.1934-11.1924v-30.8877c0-1.9575-.4447-3.8377-1.2388-5.5397Zm-66.7931-18.8778v35.2061h1.5113v-10.7879c0-.3262.0132-.65.0375-.9714-.024.3212-.037.6448-.037.9707v30.8877c0,3.0512,1.2302,5.8181,3.2169,7.8391-.001-.001-.002-.0018-.003-.0028-29.6951-1.1935-53.4883-25.723-53.4883-55.7184,0-30.755,25.0099-55.7759,55.7514-55.7759s55.7512,25.0209,55.7512,55.7759c0,2.0822-.1242,4.1353-.3475,6.1589-.7296-.5236-1.5109-.9811-2.3406-1.3529v-2.791c0-8.027-3.7652-15.1869-9.6173-19.8212-3.8016-9.2543-10.4838-17.2112-19.3022-22.5352.3812,1.6523.5083,3.1774.5083,4.8297,0,4.8487-1.4382,9.3832-3.8906,13.2061.0031-.0009.0061-.0013.0092-.0022-1.7772.4825-3.5391,1.1374-5.2742,1.9848-7.8931,3.8555-12.9932,12.1621-12.9932,21.1621v3.9668c-2.4653,1.1048-4.5251,2.9335-5.937,5.1815.0011-.0017.002-.0035.0031-.0052v-17.4053h-3.5579Zm64.0317,55.3047c0,3.9725-3.2204,7.1929-7.193,7.1929h-44.134c-3.9726,0-7.193-3.2203-7.193-7.1929v-30.887c0-4.62,3.5-8.54,7.98-9.24v-6.9156c0-7.4088,4.0921-14.3167,10.7493-17.5682,16.0264-7.8276,31.8107,3.6011,31.8107,18.7438v5.74c4.48.7,7.98,4.62,7.98,9.24v30.887Z" style="fill:#0f0f0d; stroke-width:0px;"/></g></svg>

share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#0f0f0d;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#0f0f0d;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#0f0f0d;"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#0f0f0d; stroke-width:0px;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#0f0f0d; stroke-width:0px;"/></g></g></svg>

share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none;"/><g><path d="m64.0001,3.1C30.4344,3.1,3.1268,30.4196,3.1268,64s27.3076,60.9,60.8733,60.9c5.0972,0,10.0468-.6386,14.7816-1.8249l-9.0659.0002c-5.8972,0-10.7324-4.5876-11.1521-10.3796-24.5766-2.7011-43.7623-23.4863-43.7623-48.9033,0-17.2897,9.0419-33.2493,23.9344-42.16-.2659,1.7289-.5318,3.3249-.5318,5.0539,0,10.2407,5.9835,19.1516,14.7595,23.2744v46.6819l5.5588,5.56v-10.4196h-1.5113v-35.2061h3.558v17.4053c1.4119-2.2455,3.4703-4.0722,5.9338-5.1766v-3.9668c0-9,5.1006-17.3066,12.9932-21.1621,1.7899-.8741,3.6082-1.5444,5.4425-2.0302,3.0391-4.2258,4.8575-9.3926,4.8575-14.9603,0-1.729-.133-3.325-.5319-5.054,10.6012,6.4003,18.2292,16.4456,21.7485,27.9997,3.7678,4.4161,6.0499,10.1364,6.0499,16.3827v2.791c2.9691,1.3311,5.3574,3.7062,6.723,6.6068.7042-3.6993,1.0876-7.5112,1.0876-11.4125,0-33.5804-27.3074-60.9-60.873-60.9Zm0,25.3885c-4.8287,0-8.7679-3.94-8.7679-8.7698,0-.6355.1271-1.2709.2542-1.9064,2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5137.7626.1271.6355.2542,1.2709.2542,1.9064,0,4.8298-3.9393,8.7698-8.7679,8.7698Z" style="fill:#fcfcfc;"/><path d="m113.0629,71.7548v-5.74c0-15.1427-15.7844-26.5714-31.8107-18.7438-6.6572,3.2515-10.7493,10.1594-10.7493,17.5682v6.9156c-4.48.7-7.98,4.62-7.98,9.24v30.887c0,3.9726,3.2204,7.193,7.193,7.193h44.134c3.9726,0,7.193-3.2205,7.193-7.193v-30.887c0-4.62-3.5-8.54-7.98-9.24Zm-13.02,0h-16.38v-8.3641c0-2.1614,1.1065-4.1924,2.9459-5.3275,6.7495-4.165,13.4341.6205,13.4341,6.6917v7Z" style="fill:#fcfcfc;"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><path d="m64.0001,3.1C30.4344,3.1,3.1268,30.4196,3.1268,64s27.3076,60.9,60.8733,60.9c5.0972,0,10.0468-.6386,14.7816-1.8249l-9.0659.0002c-5.8972,0-10.7324-4.5876-11.1521-10.3796-24.5766-2.7011-43.7623-23.4863-43.7623-48.9033,0-17.2897,9.0419-33.2493,23.9344-42.16-.2659,1.7289-.5318,3.3249-.5318,5.0539,0,10.2407,5.9835,19.1516,14.7595,23.2744v46.6819l5.5588,5.56v-10.4196h-1.5113v-35.2061h3.558v17.4053c1.4119-2.2455,3.4703-4.0722,5.9338-5.1766v-3.9668c0-9,5.1006-17.3066,12.9932-21.1621,1.7899-.8741,3.6082-1.5444,5.4425-2.0302,3.0391-4.2258,4.8575-9.3926,4.8575-14.9603,0-1.729-.133-3.325-.5319-5.054,10.6012,6.4003,18.2292,16.4456,21.7485,27.9997,3.7678,4.4161,6.0499,10.1364,6.0499,16.3827v2.791c2.9691,1.3311,5.3574,3.7062,6.723,6.6068.7042-3.6993,1.0876-7.5112,1.0876-11.4125,0-33.5804-27.3074-60.9-60.873-60.9Zm0,25.3885c-4.8287,0-8.7679-3.94-8.7679-8.7698,0-.6355.1271-1.2709.2542-1.9064,2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5137.7626.1271.6355.2542,1.2709.2542,1.9064,0,4.8298-3.9393,8.7698-8.7679,8.7698Z" style="fill:#fcfcfc; stroke-width:0px;"/><path d="m113.0629,71.7548v-5.74c0-15.1427-15.7844-26.5714-31.8107-18.7438-6.6572,3.2515-10.7493,10.1594-10.7493,17.5682v6.9156c-4.48.7-7.98,4.62-7.98,9.24v30.887c0,3.9726,3.2204,7.193,7.193,7.193h44.134c3.9726,0,7.193-3.2205,7.193-7.193v-30.887c0-4.62-3.5-8.54-7.98-9.24Zm-13.02,0h-16.38v-8.3641c0-2.1614,1.1065-4.1924,2.9459-5.3275,6.7495-4.165,13.4341.6205,13.4341,6.6917v7Z" style="fill:#fcfcfc; stroke-width:0px;"/></g></svg>

share/icons/application/scalable/apps/keepassxc-monochrome-light.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none;"/><path d="m64.0001,3.1C30.4344,3.1,3.1267,30.4196,3.1267,64s27.3077,60.9,60.8733,60.9,60.873-27.3199,60.873-60.9S97.5657,3.1,64.0001,3.1Zm-8.5138,14.7123c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5137.7626.1271.6355.2542,1.2709.2542,1.9064,0,4.8298-3.9393,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Zm5.0829,38.7648v35.2061h-3.558v-35.2061h3.558Zm3.4309,56.4242c-27.1257,0-49.1986-21.9445-49.1986-49.2088,0-17.2897,9.0419-33.2493,23.9344-42.16-.2659,1.7289-.5318,3.3249-.5318,5.0539,0,10.2407,5.9835,19.1515,14.7595,23.2744v46.6819l11.0365,11.0387,11.0364-11.0387-.6648-9.7088,5.1858-5.1869-5.1858-5.1869,7.8452-7.8468-7.8452-7.8468.6648-10.9057c8.643-4.1229,14.7596-13.0337,14.7596-23.2744,0-1.729-.133-3.325-.5319-5.0539,14.7596,8.9108,23.8015,24.8704,23.9344,42.1601,0,27.1313-21.9399,49.2088-49.1985,49.2088Z" style="fill:#fcfcfc;"/></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><path d="m64.0001,3.1C30.4344,3.1,3.1267,30.4196,3.1267,64s27.3077,60.9,60.8733,60.9,60.873-27.3199,60.873-60.9S97.5657,3.1,64.0001,3.1Zm-8.5138,14.7123c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5137.7626.1271.6355.2542,1.2709.2542,1.9064,0,4.8298-3.9393,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Zm5.0829,38.7648v35.2061h-3.558v-35.2061h3.558Zm3.4309,56.4242c-27.1257,0-49.1986-21.9445-49.1986-49.2088,0-17.2897,9.0419-33.2493,23.9344-42.16-.2659,1.7289-.5318,3.3249-.5318,5.0539,0,10.2407,5.9835,19.1515,14.7595,23.2744v46.6819l11.0365,11.0387,11.0364-11.0387-.6648-9.7088,5.1858-5.1869-5.1858-5.1869,7.8452-7.8468-7.8452-7.8468.6648-10.9057c8.643-4.1229,14.7596-13.0337,14.7596-23.2744,0-1.729-.133-3.325-.5319-5.0539,14.7596,8.9108,23.8015,24.8704,23.9344,42.1601,0,27.1313-21.9399,49.2088-49.1985,49.2088Z" style="fill:#fcfcfc; stroke-width:0px;"/></g></svg>

src/gui/Icons.cpp

@@ -79,29 +79,27 @@ QString Icons::trayIconAppearance() const
     return iconAppearance;
 }
 
-QIcon Icons::trayIcon(QString style)
+QIcon Icons::trayIcon(bool unlocked)
 {
-    if (style == "unlocked") {
-        style.clear();
-    }
-    if (!style.isEmpty()) {
-        style = "-" + style;
+    QString suffix;
+    if (!unlocked) {
+        suffix = "-locked";
     }
 
     auto iconApperance = trayIconAppearance();
     if (!iconApperance.startsWith("monochrome")) {
-        return icon(QString("%1%2").arg(applicationIconName(), style), false);
+        return icon(QString("%1%2").arg(applicationIconName(), suffix), false);
     }
 
     QIcon i;
 #if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
     if (osUtils->isStatusBarDark()) {
-        i = icon(QString("keepassxc-monochrome-light%1").arg(style), false);
+        i = icon(QString("keepassxc-monochrome-light%1").arg(suffix), false);
     } else {
-        i = icon(QString("keepassxc-monochrome-dark%1").arg(style), false);
+        i = icon(QString("keepassxc-monochrome-dark%1").arg(suffix), false);
     }
 #else
-    i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, style), false);
+    i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, suffix), false);
 #endif
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     // Set as mask to allow the operating system to recolour the tray icon. This may look weird
@@ -113,16 +111,6 @@ QIcon Icons::trayIcon(QString style)
     return i;
 }
 
-QIcon Icons::trayIconLocked()
-{
-    return trayIcon("locked");
-}
-
-QIcon Icons::trayIconUnlocked()
-{
-    return trayIcon("unlocked");
-}
-
 AdaptiveIconEngine::AdaptiveIconEngine(QIcon baseIcon, QColor overrideColor)
     : QIconEngine()
     , m_baseIcon(std::move(baseIcon))

src/gui/Icons.h

@@ -29,9 +29,7 @@ class Icons
 public:
     QString applicationIconName();
     QIcon applicationIcon();
-    QIcon trayIcon(QString style = "unlocked");
-    QIcon trayIconLocked();
-    QIcon trayIconUnlocked();
+    QIcon trayIcon(bool unlocked = true);
     QString trayIconAppearance() const;
     QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid);
     QIcon onOffIcon(const QString& name, bool on, bool recolor = true);

src/gui/MainWindow.cpp

@@ -1561,12 +1561,8 @@ void MainWindow::updateTrayIcon()
             connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow()));
         }
 
-        if (m_ui->tabWidget->hasLockableDatabases()) {
-            m_trayIcon->setIcon(icons()->trayIconUnlocked());
-        } else {
-            m_trayIcon->setIcon(icons()->trayIconLocked());
-        }
-
+        bool showUnlocked = m_ui->tabWidget->hasLockableDatabases();
+        m_trayIcon->setIcon(icons()->trayIcon(showUnlocked));
         m_trayIcon->setToolTip(windowTitle().replace("[*]", isWindowModified() ? "*" : ""));
         m_trayIcon->show();