diff --git a/release-tool b/release-tool
index 9d9d4fa9fb..82d4fbc393 100755
--- a/release-tool
+++ b/release-tool
@@ -1147,7 +1147,7 @@ appsign() {
fi
logInfo "Signing app using codesign..."
- codesign --sign "${key}" --verbose --deep ./app/KeePassXC.app
+ codesign --sign "${key}" --verbose --deep --entitlements ${orig_dir}/share/macosx/keepassxc.entitlements ./app/KeePassXC.app
if [ 0 -ne $? ]; then
cd "${orig_dir}"
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 06b718130c..214c0ec927 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -45,98 +45,96 @@ install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/appli
FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
add_custom_target(icons
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
-
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
-
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
-
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
-
- # SVGZ to PNGs for KeePassXC MIME-Type
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 22 -h 22
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
-
- # ICNS for MacOS
- COMMAND png2icns macosx/keepassxc.icns
- icons/application/16x16/apps/keepassxc.png
- icons/application/32x32/apps/keepassxc.png
- icons/application/48x48/apps/keepassxc.png
- icons/application/128x128/apps/keepassxc.png
- icons/application/256x256/apps/keepassxc.png
-
- # ICO for Windows
- COMMAND icotool -c -o windows/keepassxc.ico
- icons/application/16x16/apps/keepassxc.png
- icons/application/24x24/apps/keepassxc.png
- icons/application/32x32/apps/keepassxc.png
- icons/application/48x48/apps/keepassxc.png
- icons/application/64x64/apps/keepassxc.png
- icons/application/128x128/apps/keepassxc.png
- icons/application/256x256/apps/keepassxc.png
- VERBATIM
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
+
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
+
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
+
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
+
+ # SVG to PNGs for KeePassXC MIME-Type
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 22 -h 22
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
+
+ # Shrink PNGs using pngcrush
+ COMMAND bash ./crushpng.sh icons
+
+ # ICNS for MacOS
+ COMMAND png2icns macosx/keepassxc.icns
+ icons/application/16x16/apps/keepassxc.png
+ icons/application/32x32/apps/keepassxc.png
+ icons/application/48x48/apps/keepassxc.png
+ icons/application/128x128/apps/keepassxc.png
+ icons/application/256x256/apps/keepassxc.png
+
+ # ICO for Windows
+ COMMAND bash ./windows/create-ico.sh icons/application/scalable/apps/keepassxc.svg windows/keepassxc.ico
+ COMMAND bash ./windows/create-ico.sh icons/application/scalable/mimetypes/application-x-keepassxc.svg windows/keepassxc-kdbx.ico
+
+ VERBATIM
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/share/crushpng.sh b/share/crushpng.sh
new file mode 100644
index 0000000000..f36176d3c2
--- /dev/null
+++ b/share/crushpng.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ -z $1 ]]; then
+ echo "You must supply a root folder!"
+ exit 1
+fi
+
+find "$1" -iname '*png' -exec pngcrush -ow -brute {} \;
\ No newline at end of file
diff --git a/share/icons/application/128x128/apps/keepassxc-dark.png b/share/icons/application/128x128/apps/keepassxc-dark.png
index 57ad32062a..d2cc1d5803 100644
Binary files a/share/icons/application/128x128/apps/keepassxc-dark.png and b/share/icons/application/128x128/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/128x128/apps/keepassxc-locked.png b/share/icons/application/128x128/apps/keepassxc-locked.png
index 0465596ec3..b850f577e8 100644
Binary files a/share/icons/application/128x128/apps/keepassxc-locked.png and b/share/icons/application/128x128/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/128x128/apps/keepassxc-unlocked.png b/share/icons/application/128x128/apps/keepassxc-unlocked.png
index 69b0fe24ee..30a8202613 100644
Binary files a/share/icons/application/128x128/apps/keepassxc-unlocked.png and b/share/icons/application/128x128/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/128x128/apps/keepassxc.png b/share/icons/application/128x128/apps/keepassxc.png
index 69b0fe24ee..30a8202613 100644
Binary files a/share/icons/application/128x128/apps/keepassxc.png and b/share/icons/application/128x128/apps/keepassxc.png differ
diff --git a/share/icons/application/128x128/apps/preferences-system-network-sharing.png b/share/icons/application/128x128/apps/preferences-system-network-sharing.png
index 5a934582c8..88a251701c 100644
Binary files a/share/icons/application/128x128/apps/preferences-system-network-sharing.png and b/share/icons/application/128x128/apps/preferences-system-network-sharing.png differ
diff --git a/share/icons/application/128x128/mimetypes/application-x-keepassxc.png b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png
index 539823d923..dac32fed48 100644
Binary files a/share/icons/application/128x128/mimetypes/application-x-keepassxc.png and b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/16x16/actions/application-exit.png b/share/icons/application/16x16/actions/application-exit.png
index 4839c61429..eaad4c44d8 100644
Binary files a/share/icons/application/16x16/actions/application-exit.png and b/share/icons/application/16x16/actions/application-exit.png differ
diff --git a/share/icons/application/16x16/actions/auto-type.png b/share/icons/application/16x16/actions/auto-type.png
index 3d4481d144..ee985dac41 100644
Binary files a/share/icons/application/16x16/actions/auto-type.png and b/share/icons/application/16x16/actions/auto-type.png differ
diff --git a/share/icons/application/16x16/actions/configure.png b/share/icons/application/16x16/actions/configure.png
index f5f1bab882..80d1815c61 100644
Binary files a/share/icons/application/16x16/actions/configure.png and b/share/icons/application/16x16/actions/configure.png differ
diff --git a/share/icons/application/16x16/actions/database-change-key.png b/share/icons/application/16x16/actions/database-change-key.png
index ef0b0301b3..186c07728f 100644
Binary files a/share/icons/application/16x16/actions/database-change-key.png and b/share/icons/application/16x16/actions/database-change-key.png differ
diff --git a/share/icons/application/16x16/actions/document-close.png b/share/icons/application/16x16/actions/document-close.png
index 411031eb8b..fcfaa46c0c 100644
Binary files a/share/icons/application/16x16/actions/document-close.png and b/share/icons/application/16x16/actions/document-close.png differ
diff --git a/share/icons/application/16x16/actions/document-edit.png b/share/icons/application/16x16/actions/document-edit.png
index 67059e3582..7ddca1fca6 100644
Binary files a/share/icons/application/16x16/actions/document-edit.png and b/share/icons/application/16x16/actions/document-edit.png differ
diff --git a/share/icons/application/16x16/actions/document-encrypt.png b/share/icons/application/16x16/actions/document-encrypt.png
index ac2fd6f90f..b06801211f 100644
Binary files a/share/icons/application/16x16/actions/document-encrypt.png and b/share/icons/application/16x16/actions/document-encrypt.png differ
diff --git a/share/icons/application/16x16/actions/document-new.png b/share/icons/application/16x16/actions/document-new.png
index b79e903148..a8e07a5e95 100644
Binary files a/share/icons/application/16x16/actions/document-new.png and b/share/icons/application/16x16/actions/document-new.png differ
diff --git a/share/icons/application/16x16/actions/document-open.png b/share/icons/application/16x16/actions/document-open.png
index 530940ce59..0dba17b670 100644
Binary files a/share/icons/application/16x16/actions/document-open.png and b/share/icons/application/16x16/actions/document-open.png differ
diff --git a/share/icons/application/16x16/actions/document-save-as.png b/share/icons/application/16x16/actions/document-save-as.png
index 41c52aaa9f..f0f278941b 100644
Binary files a/share/icons/application/16x16/actions/document-save-as.png and b/share/icons/application/16x16/actions/document-save-as.png differ
diff --git a/share/icons/application/16x16/actions/document-save.png b/share/icons/application/16x16/actions/document-save.png
index 5a29dae472..59a0e255a1 100644
Binary files a/share/icons/application/16x16/actions/document-save.png and b/share/icons/application/16x16/actions/document-save.png differ
diff --git a/share/icons/application/16x16/actions/edit-clear-locationbar-ltr.png b/share/icons/application/16x16/actions/edit-clear-locationbar-ltr.png
index 97c8e38a76..c16b812fcb 100644
Binary files a/share/icons/application/16x16/actions/edit-clear-locationbar-ltr.png and b/share/icons/application/16x16/actions/edit-clear-locationbar-ltr.png differ
diff --git a/share/icons/application/16x16/actions/edit-clear-locationbar-rtl.png b/share/icons/application/16x16/actions/edit-clear-locationbar-rtl.png
index 85e31eb30a..34e805d24f 100644
Binary files a/share/icons/application/16x16/actions/edit-clear-locationbar-rtl.png and b/share/icons/application/16x16/actions/edit-clear-locationbar-rtl.png differ
diff --git a/share/icons/application/16x16/actions/entry-clone.png b/share/icons/application/16x16/actions/entry-clone.png
index 43e5a521db..9846255b8b 100644
Binary files a/share/icons/application/16x16/actions/entry-clone.png and b/share/icons/application/16x16/actions/entry-clone.png differ
diff --git a/share/icons/application/16x16/actions/entry-delete.png b/share/icons/application/16x16/actions/entry-delete.png
index 0a21e090e6..d8f784c755 100644
Binary files a/share/icons/application/16x16/actions/entry-delete.png and b/share/icons/application/16x16/actions/entry-delete.png differ
diff --git a/share/icons/application/16x16/actions/entry-edit.png b/share/icons/application/16x16/actions/entry-edit.png
index 83f4eed2c9..c6f04a4942 100644
Binary files a/share/icons/application/16x16/actions/entry-edit.png and b/share/icons/application/16x16/actions/entry-edit.png differ
diff --git a/share/icons/application/16x16/actions/entry-new.png b/share/icons/application/16x16/actions/entry-new.png
index 3f6a25e4fa..b4ff1d8ebc 100644
Binary files a/share/icons/application/16x16/actions/entry-new.png and b/share/icons/application/16x16/actions/entry-new.png differ
diff --git a/share/icons/application/16x16/actions/favicon-download.png b/share/icons/application/16x16/actions/favicon-download.png
index 80bc4a65dc..3426fb937e 100644
Binary files a/share/icons/application/16x16/actions/favicon-download.png and b/share/icons/application/16x16/actions/favicon-download.png differ
diff --git a/share/icons/application/16x16/actions/group-empty-trash.png b/share/icons/application/16x16/actions/group-empty-trash.png
index aa9d7321f9..d09e079356 100644
Binary files a/share/icons/application/16x16/actions/group-empty-trash.png and b/share/icons/application/16x16/actions/group-empty-trash.png differ
diff --git a/share/icons/application/16x16/actions/help-about.png b/share/icons/application/16x16/actions/help-about.png
index 7c524e5d47..225dbb6957 100644
Binary files a/share/icons/application/16x16/actions/help-about.png and b/share/icons/application/16x16/actions/help-about.png differ
diff --git a/share/icons/application/16x16/actions/message-close.png b/share/icons/application/16x16/actions/message-close.png
index b3a44a232b..ddf5a667da 100644
Binary files a/share/icons/application/16x16/actions/message-close.png and b/share/icons/application/16x16/actions/message-close.png differ
diff --git a/share/icons/application/16x16/actions/paperclip.png b/share/icons/application/16x16/actions/paperclip.png
index c09bde3b0e..b84d865d0f 100644
Binary files a/share/icons/application/16x16/actions/paperclip.png and b/share/icons/application/16x16/actions/paperclip.png differ
diff --git a/share/icons/application/16x16/actions/password-copy.png b/share/icons/application/16x16/actions/password-copy.png
index 7443d3fbab..4f0f502a0d 100644
Binary files a/share/icons/application/16x16/actions/password-copy.png and b/share/icons/application/16x16/actions/password-copy.png differ
diff --git a/share/icons/application/16x16/actions/password-generate.png b/share/icons/application/16x16/actions/password-generate.png
index 74578fb8d5..8f9c5aec8e 100644
Binary files a/share/icons/application/16x16/actions/password-generate.png and b/share/icons/application/16x16/actions/password-generate.png differ
diff --git a/share/icons/application/16x16/actions/password-generator.png b/share/icons/application/16x16/actions/password-generator.png
index 735459681e..1fd64960e2 100644
Binary files a/share/icons/application/16x16/actions/password-generator.png and b/share/icons/application/16x16/actions/password-generator.png differ
diff --git a/share/icons/application/16x16/actions/password-show-off.png b/share/icons/application/16x16/actions/password-show-off.png
index 24277f6dea..209062d785 100644
Binary files a/share/icons/application/16x16/actions/password-show-off.png and b/share/icons/application/16x16/actions/password-show-off.png differ
diff --git a/share/icons/application/16x16/actions/password-show-on.png b/share/icons/application/16x16/actions/password-show-on.png
index ea53bd1c0b..a6b89cdabd 100644
Binary files a/share/icons/application/16x16/actions/password-show-on.png and b/share/icons/application/16x16/actions/password-show-on.png differ
diff --git a/share/icons/application/16x16/actions/system-help.png b/share/icons/application/16x16/actions/system-help.png
index 75ebaf7f5f..adb2d8e210 100644
Binary files a/share/icons/application/16x16/actions/system-help.png and b/share/icons/application/16x16/actions/system-help.png differ
diff --git a/share/icons/application/16x16/actions/system-search.png b/share/icons/application/16x16/actions/system-search.png
index 354c0f98fb..ad7f3c59fb 100644
Binary files a/share/icons/application/16x16/actions/system-search.png and b/share/icons/application/16x16/actions/system-search.png differ
diff --git a/share/icons/application/16x16/actions/url-copy.png b/share/icons/application/16x16/actions/url-copy.png
index 113107c109..90fa595e79 100644
Binary files a/share/icons/application/16x16/actions/url-copy.png and b/share/icons/application/16x16/actions/url-copy.png differ
diff --git a/share/icons/application/16x16/actions/username-copy.png b/share/icons/application/16x16/actions/username-copy.png
index 65b48fdf5b..e2f855c89e 100644
Binary files a/share/icons/application/16x16/actions/username-copy.png and b/share/icons/application/16x16/actions/username-copy.png differ
diff --git a/share/icons/application/16x16/apps/keepassxc-dark.png b/share/icons/application/16x16/apps/keepassxc-dark.png
index 3c10ad4b76..1419cbffe3 100644
Binary files a/share/icons/application/16x16/apps/keepassxc-dark.png and b/share/icons/application/16x16/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/16x16/apps/keepassxc-locked.png b/share/icons/application/16x16/apps/keepassxc-locked.png
index 711b3ba107..7f173c6402 100644
Binary files a/share/icons/application/16x16/apps/keepassxc-locked.png and b/share/icons/application/16x16/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/16x16/apps/keepassxc-unlocked.png b/share/icons/application/16x16/apps/keepassxc-unlocked.png
index 2164f0335e..3b9c3f4a0e 100644
Binary files a/share/icons/application/16x16/apps/keepassxc-unlocked.png and b/share/icons/application/16x16/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/16x16/apps/keepassxc.png b/share/icons/application/16x16/apps/keepassxc.png
index 2164f0335e..3b9c3f4a0e 100644
Binary files a/share/icons/application/16x16/apps/keepassxc.png and b/share/icons/application/16x16/apps/keepassxc.png differ
diff --git a/share/icons/application/16x16/mimetypes/application-x-keepassxc.png b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png
index 7bfdf6d592..bd7d98e7ea 100644
Binary files a/share/icons/application/16x16/mimetypes/application-x-keepassxc.png and b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/22x22/actions/auto-type.png b/share/icons/application/22x22/actions/auto-type.png
index 29d02664f3..dcc8b75d1f 100644
Binary files a/share/icons/application/22x22/actions/auto-type.png and b/share/icons/application/22x22/actions/auto-type.png differ
diff --git a/share/icons/application/22x22/actions/chronometer.png b/share/icons/application/22x22/actions/chronometer.png
index 71d6eabe5f..8e8d61de93 100644
Binary files a/share/icons/application/22x22/actions/chronometer.png and b/share/icons/application/22x22/actions/chronometer.png differ
diff --git a/share/icons/application/22x22/actions/database-change-key.png b/share/icons/application/22x22/actions/database-change-key.png
index 3ea98fa709..7bf8d05d33 100644
Binary files a/share/icons/application/22x22/actions/database-change-key.png and b/share/icons/application/22x22/actions/database-change-key.png differ
diff --git a/share/icons/application/22x22/actions/dialog-close.png b/share/icons/application/22x22/actions/dialog-close.png
index ef0b6bdc66..81f85067de 100644
Binary files a/share/icons/application/22x22/actions/dialog-close.png and b/share/icons/application/22x22/actions/dialog-close.png differ
diff --git a/share/icons/application/22x22/actions/dialog-ok.png b/share/icons/application/22x22/actions/dialog-ok.png
index 8b12d79a4b..bb27eea88b 100644
Binary files a/share/icons/application/22x22/actions/dialog-ok.png and b/share/icons/application/22x22/actions/dialog-ok.png differ
diff --git a/share/icons/application/22x22/actions/document-encrypt.png b/share/icons/application/22x22/actions/document-encrypt.png
index 38dff012da..eed69ac51a 100644
Binary files a/share/icons/application/22x22/actions/document-encrypt.png and b/share/icons/application/22x22/actions/document-encrypt.png differ
diff --git a/share/icons/application/22x22/actions/document-new.png b/share/icons/application/22x22/actions/document-new.png
index 9ff24e2b28..50f67bfb40 100644
Binary files a/share/icons/application/22x22/actions/document-new.png and b/share/icons/application/22x22/actions/document-new.png differ
diff --git a/share/icons/application/22x22/actions/document-open.png b/share/icons/application/22x22/actions/document-open.png
index 317a3577a0..dff45686b5 100644
Binary files a/share/icons/application/22x22/actions/document-open.png and b/share/icons/application/22x22/actions/document-open.png differ
diff --git a/share/icons/application/22x22/actions/document-save.png b/share/icons/application/22x22/actions/document-save.png
index a81e70d474..2ad801c13e 100644
Binary files a/share/icons/application/22x22/actions/document-save.png and b/share/icons/application/22x22/actions/document-save.png differ
diff --git a/share/icons/application/22x22/actions/entry-clone.png b/share/icons/application/22x22/actions/entry-clone.png
index 89383d9e04..fc4787dfd8 100644
Binary files a/share/icons/application/22x22/actions/entry-clone.png and b/share/icons/application/22x22/actions/entry-clone.png differ
diff --git a/share/icons/application/22x22/actions/entry-delete.png b/share/icons/application/22x22/actions/entry-delete.png
index 11b846e8ce..9ad1885cb1 100644
Binary files a/share/icons/application/22x22/actions/entry-delete.png and b/share/icons/application/22x22/actions/entry-delete.png differ
diff --git a/share/icons/application/22x22/actions/entry-edit.png b/share/icons/application/22x22/actions/entry-edit.png
index f407cfab5e..8246bfe345 100644
Binary files a/share/icons/application/22x22/actions/entry-edit.png and b/share/icons/application/22x22/actions/entry-edit.png differ
diff --git a/share/icons/application/22x22/actions/entry-new.png b/share/icons/application/22x22/actions/entry-new.png
index a1c0b34b37..ff53e2153b 100644
Binary files a/share/icons/application/22x22/actions/entry-new.png and b/share/icons/application/22x22/actions/entry-new.png differ
diff --git a/share/icons/application/22x22/actions/favicon-download.png b/share/icons/application/22x22/actions/favicon-download.png
index 96596c4bd6..8759d957e2 100644
Binary files a/share/icons/application/22x22/actions/favicon-download.png and b/share/icons/application/22x22/actions/favicon-download.png differ
diff --git a/share/icons/application/22x22/actions/group-empty-trash.png b/share/icons/application/22x22/actions/group-empty-trash.png
index 56d90a4c00..ed0bb2b726 100644
Binary files a/share/icons/application/22x22/actions/group-empty-trash.png and b/share/icons/application/22x22/actions/group-empty-trash.png differ
diff --git a/share/icons/application/22x22/actions/help-about.png b/share/icons/application/22x22/actions/help-about.png
index eb37d9a08c..4fefbf4c28 100644
Binary files a/share/icons/application/22x22/actions/help-about.png and b/share/icons/application/22x22/actions/help-about.png differ
diff --git a/share/icons/application/22x22/actions/message-close.png b/share/icons/application/22x22/actions/message-close.png
index 4b2f9ca4d7..f0850594fa 100644
Binary files a/share/icons/application/22x22/actions/message-close.png and b/share/icons/application/22x22/actions/message-close.png differ
diff --git a/share/icons/application/22x22/actions/password-copy.png b/share/icons/application/22x22/actions/password-copy.png
index eb910311a7..739652646d 100644
Binary files a/share/icons/application/22x22/actions/password-copy.png and b/share/icons/application/22x22/actions/password-copy.png differ
diff --git a/share/icons/application/22x22/actions/password-generate.png b/share/icons/application/22x22/actions/password-generate.png
index cd8c674250..590df6d4df 100644
Binary files a/share/icons/application/22x22/actions/password-generate.png and b/share/icons/application/22x22/actions/password-generate.png differ
diff --git a/share/icons/application/22x22/actions/password-generator.png b/share/icons/application/22x22/actions/password-generator.png
index fab0d90b71..68d1763f11 100644
Binary files a/share/icons/application/22x22/actions/password-generator.png and b/share/icons/application/22x22/actions/password-generator.png differ
diff --git a/share/icons/application/22x22/actions/system-help.png b/share/icons/application/22x22/actions/system-help.png
index 86b64075fb..0a890cd593 100644
Binary files a/share/icons/application/22x22/actions/system-help.png and b/share/icons/application/22x22/actions/system-help.png differ
diff --git a/share/icons/application/22x22/actions/system-search.png b/share/icons/application/22x22/actions/system-search.png
index 931d932fff..f977b606c1 100644
Binary files a/share/icons/application/22x22/actions/system-search.png and b/share/icons/application/22x22/actions/system-search.png differ
diff --git a/share/icons/application/22x22/actions/url-copy.png b/share/icons/application/22x22/actions/url-copy.png
index caa116dbc4..4a7c8acab9 100644
Binary files a/share/icons/application/22x22/actions/url-copy.png and b/share/icons/application/22x22/actions/url-copy.png differ
diff --git a/share/icons/application/22x22/actions/username-copy.png b/share/icons/application/22x22/actions/username-copy.png
index 872771d03a..81e6f5f443 100644
Binary files a/share/icons/application/22x22/actions/username-copy.png and b/share/icons/application/22x22/actions/username-copy.png differ
diff --git a/share/icons/application/22x22/mimetypes/application-x-keepassxc.png b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png
index 2fc813f6f9..22734c82d7 100644
Binary files a/share/icons/application/22x22/mimetypes/application-x-keepassxc.png and b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/22x22/status/dialog-error.png b/share/icons/application/22x22/status/dialog-error.png
index 86a92a4ee9..d27dcc8385 100644
Binary files a/share/icons/application/22x22/status/dialog-error.png and b/share/icons/application/22x22/status/dialog-error.png differ
diff --git a/share/icons/application/22x22/status/dialog-information.png b/share/icons/application/22x22/status/dialog-information.png
index 0222fcd726..91aa3829f8 100644
Binary files a/share/icons/application/22x22/status/dialog-information.png and b/share/icons/application/22x22/status/dialog-information.png differ
diff --git a/share/icons/application/22x22/status/dialog-warning.png b/share/icons/application/22x22/status/dialog-warning.png
index e322849306..6ca3d718ea 100644
Binary files a/share/icons/application/22x22/status/dialog-warning.png and b/share/icons/application/22x22/status/dialog-warning.png differ
diff --git a/share/icons/application/24x24/apps/keepassxc-dark.png b/share/icons/application/24x24/apps/keepassxc-dark.png
index f02157ecd8..396492ebe5 100644
Binary files a/share/icons/application/24x24/apps/keepassxc-dark.png and b/share/icons/application/24x24/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/24x24/apps/keepassxc-locked.png b/share/icons/application/24x24/apps/keepassxc-locked.png
index cb8485708d..6050adf22d 100644
Binary files a/share/icons/application/24x24/apps/keepassxc-locked.png and b/share/icons/application/24x24/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/24x24/apps/keepassxc-unlocked.png b/share/icons/application/24x24/apps/keepassxc-unlocked.png
index 68c6cabc18..f3061b089d 100644
Binary files a/share/icons/application/24x24/apps/keepassxc-unlocked.png and b/share/icons/application/24x24/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/24x24/apps/keepassxc.png b/share/icons/application/24x24/apps/keepassxc.png
index 68c6cabc18..f3061b089d 100644
Binary files a/share/icons/application/24x24/apps/keepassxc.png and b/share/icons/application/24x24/apps/keepassxc.png differ
diff --git a/share/icons/application/256x256/apps/keepassxc-dark.png b/share/icons/application/256x256/apps/keepassxc-dark.png
index c14badcd6e..e2a8dbf0fb 100644
Binary files a/share/icons/application/256x256/apps/keepassxc-dark.png and b/share/icons/application/256x256/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/256x256/apps/keepassxc-locked.png b/share/icons/application/256x256/apps/keepassxc-locked.png
index d3b7c05438..a3820c501e 100644
Binary files a/share/icons/application/256x256/apps/keepassxc-locked.png and b/share/icons/application/256x256/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/256x256/apps/keepassxc-unlocked.png b/share/icons/application/256x256/apps/keepassxc-unlocked.png
index d1c1178133..03485c64eb 100644
Binary files a/share/icons/application/256x256/apps/keepassxc-unlocked.png and b/share/icons/application/256x256/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/256x256/apps/keepassxc.png b/share/icons/application/256x256/apps/keepassxc.png
index d1c1178133..03485c64eb 100644
Binary files a/share/icons/application/256x256/apps/keepassxc.png and b/share/icons/application/256x256/apps/keepassxc.png differ
diff --git a/share/icons/application/32x32/actions/application-exit.png b/share/icons/application/32x32/actions/application-exit.png
index dd76354c4a..d7be16865a 100644
Binary files a/share/icons/application/32x32/actions/application-exit.png and b/share/icons/application/32x32/actions/application-exit.png differ
diff --git a/share/icons/application/32x32/actions/auto-type.png b/share/icons/application/32x32/actions/auto-type.png
index b9819fda1e..173bf29ca9 100644
Binary files a/share/icons/application/32x32/actions/auto-type.png and b/share/icons/application/32x32/actions/auto-type.png differ
diff --git a/share/icons/application/32x32/actions/chronometer.png b/share/icons/application/32x32/actions/chronometer.png
index 00386b7050..7f93991403 100644
Binary files a/share/icons/application/32x32/actions/chronometer.png and b/share/icons/application/32x32/actions/chronometer.png differ
diff --git a/share/icons/application/32x32/actions/configure.png b/share/icons/application/32x32/actions/configure.png
index c774740a1a..073f87ae95 100644
Binary files a/share/icons/application/32x32/actions/configure.png and b/share/icons/application/32x32/actions/configure.png differ
diff --git a/share/icons/application/32x32/actions/database-change-key.png b/share/icons/application/32x32/actions/database-change-key.png
index dc9599228f..1eaab8c8ed 100644
Binary files a/share/icons/application/32x32/actions/database-change-key.png and b/share/icons/application/32x32/actions/database-change-key.png differ
diff --git a/share/icons/application/32x32/actions/dialog-close.png b/share/icons/application/32x32/actions/dialog-close.png
index b049b6886a..82f6adb21b 100644
Binary files a/share/icons/application/32x32/actions/dialog-close.png and b/share/icons/application/32x32/actions/dialog-close.png differ
diff --git a/share/icons/application/32x32/actions/dialog-ok.png b/share/icons/application/32x32/actions/dialog-ok.png
index bcb4367211..f1886d070e 100644
Binary files a/share/icons/application/32x32/actions/dialog-ok.png and b/share/icons/application/32x32/actions/dialog-ok.png differ
diff --git a/share/icons/application/32x32/actions/document-close.png b/share/icons/application/32x32/actions/document-close.png
index 23b094754e..03ff2b41a8 100644
Binary files a/share/icons/application/32x32/actions/document-close.png and b/share/icons/application/32x32/actions/document-close.png differ
diff --git a/share/icons/application/32x32/actions/document-edit.png b/share/icons/application/32x32/actions/document-edit.png
index eb327b0a10..3f299e2b83 100644
Binary files a/share/icons/application/32x32/actions/document-edit.png and b/share/icons/application/32x32/actions/document-edit.png differ
diff --git a/share/icons/application/32x32/actions/document-encrypt.png b/share/icons/application/32x32/actions/document-encrypt.png
index 353a22ca25..e2c996e6c6 100644
Binary files a/share/icons/application/32x32/actions/document-encrypt.png and b/share/icons/application/32x32/actions/document-encrypt.png differ
diff --git a/share/icons/application/32x32/actions/document-new.png b/share/icons/application/32x32/actions/document-new.png
index 3d0f5cc1d5..4e24f6e240 100644
Binary files a/share/icons/application/32x32/actions/document-new.png and b/share/icons/application/32x32/actions/document-new.png differ
diff --git a/share/icons/application/32x32/actions/document-properties.png b/share/icons/application/32x32/actions/document-properties.png
index a6d13863d8..4700a60d39 100644
Binary files a/share/icons/application/32x32/actions/document-properties.png and b/share/icons/application/32x32/actions/document-properties.png differ
diff --git a/share/icons/application/32x32/actions/document-save.png b/share/icons/application/32x32/actions/document-save.png
index 7fa489c0fe..23079aec05 100644
Binary files a/share/icons/application/32x32/actions/document-save.png and b/share/icons/application/32x32/actions/document-save.png differ
diff --git a/share/icons/application/32x32/actions/edit-clear-locationbar-ltr.png b/share/icons/application/32x32/actions/edit-clear-locationbar-ltr.png
index 023cfb804f..d2ab1c14f9 100644
Binary files a/share/icons/application/32x32/actions/edit-clear-locationbar-ltr.png and b/share/icons/application/32x32/actions/edit-clear-locationbar-ltr.png differ
diff --git a/share/icons/application/32x32/actions/edit-clear-locationbar-rtl.png b/share/icons/application/32x32/actions/edit-clear-locationbar-rtl.png
index 32b0666fa7..0207e82cd0 100644
Binary files a/share/icons/application/32x32/actions/edit-clear-locationbar-rtl.png and b/share/icons/application/32x32/actions/edit-clear-locationbar-rtl.png differ
diff --git a/share/icons/application/32x32/actions/entry-clone.png b/share/icons/application/32x32/actions/entry-clone.png
index 93866ad6a7..672003a577 100644
Binary files a/share/icons/application/32x32/actions/entry-clone.png and b/share/icons/application/32x32/actions/entry-clone.png differ
diff --git a/share/icons/application/32x32/actions/entry-delete.png b/share/icons/application/32x32/actions/entry-delete.png
index d4aad094bd..f20821af12 100644
Binary files a/share/icons/application/32x32/actions/entry-delete.png and b/share/icons/application/32x32/actions/entry-delete.png differ
diff --git a/share/icons/application/32x32/actions/entry-edit.png b/share/icons/application/32x32/actions/entry-edit.png
index cd7d34804b..44f83f5484 100644
Binary files a/share/icons/application/32x32/actions/entry-edit.png and b/share/icons/application/32x32/actions/entry-edit.png differ
diff --git a/share/icons/application/32x32/actions/entry-new.png b/share/icons/application/32x32/actions/entry-new.png
index 0226c2f3f2..9911728bf1 100644
Binary files a/share/icons/application/32x32/actions/entry-new.png and b/share/icons/application/32x32/actions/entry-new.png differ
diff --git a/share/icons/application/32x32/actions/favicon-download.png b/share/icons/application/32x32/actions/favicon-download.png
index 2f838d9d75..c8d03d755c 100644
Binary files a/share/icons/application/32x32/actions/favicon-download.png and b/share/icons/application/32x32/actions/favicon-download.png differ
diff --git a/share/icons/application/32x32/actions/group-empty-trash.png b/share/icons/application/32x32/actions/group-empty-trash.png
index f19899dd80..b272ecb565 100644
Binary files a/share/icons/application/32x32/actions/group-empty-trash.png and b/share/icons/application/32x32/actions/group-empty-trash.png differ
diff --git a/share/icons/application/32x32/actions/help-about.png b/share/icons/application/32x32/actions/help-about.png
index d8197d61a3..dc047ffcad 100644
Binary files a/share/icons/application/32x32/actions/help-about.png and b/share/icons/application/32x32/actions/help-about.png differ
diff --git a/share/icons/application/32x32/actions/key-enter.png b/share/icons/application/32x32/actions/key-enter.png
index 60d11e2f11..5f20ee92ff 100644
Binary files a/share/icons/application/32x32/actions/key-enter.png and b/share/icons/application/32x32/actions/key-enter.png differ
diff --git a/share/icons/application/32x32/actions/paperclip.png b/share/icons/application/32x32/actions/paperclip.png
index d80a0b0d17..9a623973f2 100644
Binary files a/share/icons/application/32x32/actions/paperclip.png and b/share/icons/application/32x32/actions/paperclip.png differ
diff --git a/share/icons/application/32x32/actions/password-copy.png b/share/icons/application/32x32/actions/password-copy.png
index 208af47e78..c3d42f754a 100644
Binary files a/share/icons/application/32x32/actions/password-copy.png and b/share/icons/application/32x32/actions/password-copy.png differ
diff --git a/share/icons/application/32x32/actions/password-generate.png b/share/icons/application/32x32/actions/password-generate.png
index 99e878cf94..cad78bc7b0 100644
Binary files a/share/icons/application/32x32/actions/password-generate.png and b/share/icons/application/32x32/actions/password-generate.png differ
diff --git a/share/icons/application/32x32/actions/password-generator.png b/share/icons/application/32x32/actions/password-generator.png
index 0a49a74b11..a06575f8cf 100644
Binary files a/share/icons/application/32x32/actions/password-generator.png and b/share/icons/application/32x32/actions/password-generator.png differ
diff --git a/share/icons/application/32x32/actions/password-show-off.png b/share/icons/application/32x32/actions/password-show-off.png
index 6072f70ccb..ff5fab697d 100644
Binary files a/share/icons/application/32x32/actions/password-show-off.png and b/share/icons/application/32x32/actions/password-show-off.png differ
diff --git a/share/icons/application/32x32/actions/password-show-on.png b/share/icons/application/32x32/actions/password-show-on.png
index 327ea8963c..72cebaa6fe 100644
Binary files a/share/icons/application/32x32/actions/password-show-on.png and b/share/icons/application/32x32/actions/password-show-on.png differ
diff --git a/share/icons/application/32x32/actions/system-help.png b/share/icons/application/32x32/actions/system-help.png
index 8a9eb1a827..19440a1908 100644
Binary files a/share/icons/application/32x32/actions/system-help.png and b/share/icons/application/32x32/actions/system-help.png differ
diff --git a/share/icons/application/32x32/actions/system-search.png b/share/icons/application/32x32/actions/system-search.png
index 62f67a23f1..9c25683474 100644
Binary files a/share/icons/application/32x32/actions/system-search.png and b/share/icons/application/32x32/actions/system-search.png differ
diff --git a/share/icons/application/32x32/actions/url-copy.png b/share/icons/application/32x32/actions/url-copy.png
index 16950eca68..0ca01aeb7f 100644
Binary files a/share/icons/application/32x32/actions/url-copy.png and b/share/icons/application/32x32/actions/url-copy.png differ
diff --git a/share/icons/application/32x32/actions/username-copy.png b/share/icons/application/32x32/actions/username-copy.png
index 16ca8cf314..b781df635b 100644
Binary files a/share/icons/application/32x32/actions/username-copy.png and b/share/icons/application/32x32/actions/username-copy.png differ
diff --git a/share/icons/application/32x32/actions/view-history.png b/share/icons/application/32x32/actions/view-history.png
index a67c689ac5..fe9a9d113a 100644
Binary files a/share/icons/application/32x32/actions/view-history.png and b/share/icons/application/32x32/actions/view-history.png differ
diff --git a/share/icons/application/32x32/apps/internet-web-browser.png b/share/icons/application/32x32/apps/internet-web-browser.png
index b4106a58b3..67aa94aff1 100644
Binary files a/share/icons/application/32x32/apps/internet-web-browser.png and b/share/icons/application/32x32/apps/internet-web-browser.png differ
diff --git a/share/icons/application/32x32/apps/keepassxc-dark.png b/share/icons/application/32x32/apps/keepassxc-dark.png
index b2092359e6..eb3f274f30 100644
Binary files a/share/icons/application/32x32/apps/keepassxc-dark.png and b/share/icons/application/32x32/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/32x32/apps/keepassxc-locked.png b/share/icons/application/32x32/apps/keepassxc-locked.png
index dbe8f45dd3..cc08472c28 100644
Binary files a/share/icons/application/32x32/apps/keepassxc-locked.png and b/share/icons/application/32x32/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/32x32/apps/keepassxc-unlocked.png b/share/icons/application/32x32/apps/keepassxc-unlocked.png
index de06bf03ae..5aff3b570e 100644
Binary files a/share/icons/application/32x32/apps/keepassxc-unlocked.png and b/share/icons/application/32x32/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/32x32/apps/keepassxc.png b/share/icons/application/32x32/apps/keepassxc.png
index de06bf03ae..5aff3b570e 100644
Binary files a/share/icons/application/32x32/apps/keepassxc.png and b/share/icons/application/32x32/apps/keepassxc.png differ
diff --git a/share/icons/application/32x32/apps/preferences-desktop-icons.png b/share/icons/application/32x32/apps/preferences-desktop-icons.png
index dcd605b254..3965468a5c 100644
Binary files a/share/icons/application/32x32/apps/preferences-desktop-icons.png and b/share/icons/application/32x32/apps/preferences-desktop-icons.png differ
diff --git a/share/icons/application/32x32/apps/utilities-terminal.png b/share/icons/application/32x32/apps/utilities-terminal.png
index 3e4d324c0c..3ce4cc2450 100644
Binary files a/share/icons/application/32x32/apps/utilities-terminal.png and b/share/icons/application/32x32/apps/utilities-terminal.png differ
diff --git a/share/icons/application/32x32/categories/preferences-other.png b/share/icons/application/32x32/categories/preferences-other.png
index acafe44c68..24c03a1294 100644
Binary files a/share/icons/application/32x32/categories/preferences-other.png and b/share/icons/application/32x32/categories/preferences-other.png differ
diff --git a/share/icons/application/32x32/mimetypes/application-x-keepassxc.png b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png
index 195f792d87..d7cf40a287 100644
Binary files a/share/icons/application/32x32/mimetypes/application-x-keepassxc.png and b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/32x32/status/security-high.png b/share/icons/application/32x32/status/security-high.png
index 7178893c2d..01f7fcc467 100644
Binary files a/share/icons/application/32x32/status/security-high.png and b/share/icons/application/32x32/status/security-high.png differ
diff --git a/share/icons/application/48x48/apps/keepassxc-dark.png b/share/icons/application/48x48/apps/keepassxc-dark.png
index 08e396cd32..81cdcfa19f 100644
Binary files a/share/icons/application/48x48/apps/keepassxc-dark.png and b/share/icons/application/48x48/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/48x48/apps/keepassxc-locked.png b/share/icons/application/48x48/apps/keepassxc-locked.png
index 5668dd7b51..c1e87f9d08 100644
Binary files a/share/icons/application/48x48/apps/keepassxc-locked.png and b/share/icons/application/48x48/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/48x48/apps/keepassxc-unlocked.png b/share/icons/application/48x48/apps/keepassxc-unlocked.png
index 06a563d1a7..a784c36042 100644
Binary files a/share/icons/application/48x48/apps/keepassxc-unlocked.png and b/share/icons/application/48x48/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/48x48/apps/keepassxc.png b/share/icons/application/48x48/apps/keepassxc.png
index 06a563d1a7..a784c36042 100644
Binary files a/share/icons/application/48x48/apps/keepassxc.png and b/share/icons/application/48x48/apps/keepassxc.png differ
diff --git a/share/icons/application/64x64/apps/keepassxc-dark.png b/share/icons/application/64x64/apps/keepassxc-dark.png
index 439ca7e8e9..5c50146f66 100644
Binary files a/share/icons/application/64x64/apps/keepassxc-dark.png and b/share/icons/application/64x64/apps/keepassxc-dark.png differ
diff --git a/share/icons/application/64x64/apps/keepassxc-locked.png b/share/icons/application/64x64/apps/keepassxc-locked.png
index e4ca501a90..c6e7e239cd 100644
Binary files a/share/icons/application/64x64/apps/keepassxc-locked.png and b/share/icons/application/64x64/apps/keepassxc-locked.png differ
diff --git a/share/icons/application/64x64/apps/keepassxc-unlocked.png b/share/icons/application/64x64/apps/keepassxc-unlocked.png
index 8ade0e85e3..3e1d4e5cec 100644
Binary files a/share/icons/application/64x64/apps/keepassxc-unlocked.png and b/share/icons/application/64x64/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/64x64/apps/keepassxc.png b/share/icons/application/64x64/apps/keepassxc.png
index 8ade0e85e3..3e1d4e5cec 100644
Binary files a/share/icons/application/64x64/apps/keepassxc.png and b/share/icons/application/64x64/apps/keepassxc.png differ
diff --git a/share/icons/application/64x64/mimetypes/application-x-keepassxc.png b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png
index dc97a7d246..f26e140f9f 100644
Binary files a/share/icons/application/64x64/mimetypes/application-x-keepassxc.png and b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
index 58e5960949..4b33c5a69e 100644
--- a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
+++ b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
@@ -1,377 +1,2 @@
-
-
+
+
diff --git a/share/icons/database/C00_Password.png b/share/icons/database/C00_Password.png
index 5656824986..86fa47f04c 100644
Binary files a/share/icons/database/C00_Password.png and b/share/icons/database/C00_Password.png differ
diff --git a/share/icons/database/C01_Package_Network.png b/share/icons/database/C01_Package_Network.png
index 03ef9a5700..dceb0a528f 100644
Binary files a/share/icons/database/C01_Package_Network.png and b/share/icons/database/C01_Package_Network.png differ
diff --git a/share/icons/database/C02_MessageBox_Warning.png b/share/icons/database/C02_MessageBox_Warning.png
index 474f63fc9c..0b8a56f470 100644
Binary files a/share/icons/database/C02_MessageBox_Warning.png and b/share/icons/database/C02_MessageBox_Warning.png differ
diff --git a/share/icons/database/C03_Server.png b/share/icons/database/C03_Server.png
index bb8a316d29..00ed933167 100644
Binary files a/share/icons/database/C03_Server.png and b/share/icons/database/C03_Server.png differ
diff --git a/share/icons/database/C04_Klipper.png b/share/icons/database/C04_Klipper.png
index a2c0cfb105..a451fe1d25 100644
Binary files a/share/icons/database/C04_Klipper.png and b/share/icons/database/C04_Klipper.png differ
diff --git a/share/icons/database/C05_Edu_Languages.png b/share/icons/database/C05_Edu_Languages.png
index 8aa2004795..d36534f597 100644
Binary files a/share/icons/database/C05_Edu_Languages.png and b/share/icons/database/C05_Edu_Languages.png differ
diff --git a/share/icons/database/C06_KCMDF.png b/share/icons/database/C06_KCMDF.png
index 604c3d5939..3318957583 100644
Binary files a/share/icons/database/C06_KCMDF.png and b/share/icons/database/C06_KCMDF.png differ
diff --git a/share/icons/database/C07_Kate.png b/share/icons/database/C07_Kate.png
index 4a52bb1c5a..8427b90544 100644
Binary files a/share/icons/database/C07_Kate.png and b/share/icons/database/C07_Kate.png differ
diff --git a/share/icons/database/C08_Socket.png b/share/icons/database/C08_Socket.png
index 3125ef8049..6baa733350 100644
Binary files a/share/icons/database/C08_Socket.png and b/share/icons/database/C08_Socket.png differ
diff --git a/share/icons/database/C09_Identity.png b/share/icons/database/C09_Identity.png
index 5e51272c26..0bf21df917 100644
Binary files a/share/icons/database/C09_Identity.png and b/share/icons/database/C09_Identity.png differ
diff --git a/share/icons/database/C10_Kontact.png b/share/icons/database/C10_Kontact.png
index e4c5cdc0ee..08d441315a 100644
Binary files a/share/icons/database/C10_Kontact.png and b/share/icons/database/C10_Kontact.png differ
diff --git a/share/icons/database/C11_Camera.png b/share/icons/database/C11_Camera.png
index 45d1436aa2..e502227d00 100644
Binary files a/share/icons/database/C11_Camera.png and b/share/icons/database/C11_Camera.png differ
diff --git a/share/icons/database/C12_IRKickFlash.png b/share/icons/database/C12_IRKickFlash.png
index 89e7a97aba..4041042d3f 100644
Binary files a/share/icons/database/C12_IRKickFlash.png and b/share/icons/database/C12_IRKickFlash.png differ
diff --git a/share/icons/database/C13_KGPG_Key3.png b/share/icons/database/C13_KGPG_Key3.png
index e68afac8ba..db6aa8ec7a 100644
Binary files a/share/icons/database/C13_KGPG_Key3.png and b/share/icons/database/C13_KGPG_Key3.png differ
diff --git a/share/icons/database/C14_Laptop_Power.png b/share/icons/database/C14_Laptop_Power.png
index 69c89a59bc..8cd59f809c 100644
Binary files a/share/icons/database/C14_Laptop_Power.png and b/share/icons/database/C14_Laptop_Power.png differ
diff --git a/share/icons/database/C15_Scanner.png b/share/icons/database/C15_Scanner.png
index fa0f83dd7b..43f52ae8b8 100644
Binary files a/share/icons/database/C15_Scanner.png and b/share/icons/database/C15_Scanner.png differ
diff --git a/share/icons/database/C16_Mozilla_Firebird.png b/share/icons/database/C16_Mozilla_Firebird.png
index 7c2e6612ba..7f592c673f 100644
Binary files a/share/icons/database/C16_Mozilla_Firebird.png and b/share/icons/database/C16_Mozilla_Firebird.png differ
diff --git a/share/icons/database/C17_CDROM_Unmount.png b/share/icons/database/C17_CDROM_Unmount.png
index e2e3f679af..9471903746 100644
Binary files a/share/icons/database/C17_CDROM_Unmount.png and b/share/icons/database/C17_CDROM_Unmount.png differ
diff --git a/share/icons/database/C18_Display.png b/share/icons/database/C18_Display.png
index ededc0bd34..5348b7db25 100644
Binary files a/share/icons/database/C18_Display.png and b/share/icons/database/C18_Display.png differ
diff --git a/share/icons/database/C19_Mail_Generic.png b/share/icons/database/C19_Mail_Generic.png
index 2de442b800..ca7812aebd 100644
Binary files a/share/icons/database/C19_Mail_Generic.png and b/share/icons/database/C19_Mail_Generic.png differ
diff --git a/share/icons/database/C20_Misc.png b/share/icons/database/C20_Misc.png
index 98d4b9969e..f428e4f0d0 100644
Binary files a/share/icons/database/C20_Misc.png and b/share/icons/database/C20_Misc.png differ
diff --git a/share/icons/database/C21_KOrganizer.png b/share/icons/database/C21_KOrganizer.png
index 6c86544de8..e66e4aca86 100644
Binary files a/share/icons/database/C21_KOrganizer.png and b/share/icons/database/C21_KOrganizer.png differ
diff --git a/share/icons/database/C22_ASCII.png b/share/icons/database/C22_ASCII.png
index 8e771b7fda..dcdfbed307 100644
Binary files a/share/icons/database/C22_ASCII.png and b/share/icons/database/C22_ASCII.png differ
diff --git a/share/icons/database/C23_Icons.png b/share/icons/database/C23_Icons.png
index df51f18f96..0fcc98bd68 100644
Binary files a/share/icons/database/C23_Icons.png and b/share/icons/database/C23_Icons.png differ
diff --git a/share/icons/database/C24_Connect_Established.png b/share/icons/database/C24_Connect_Established.png
index 0f6b9f9f87..b691fb3fec 100644
Binary files a/share/icons/database/C24_Connect_Established.png and b/share/icons/database/C24_Connect_Established.png differ
diff --git a/share/icons/database/C25_Folder_Mail.png b/share/icons/database/C25_Folder_Mail.png
index 90cf4878f9..3ef9fcb602 100644
Binary files a/share/icons/database/C25_Folder_Mail.png and b/share/icons/database/C25_Folder_Mail.png differ
diff --git a/share/icons/database/C26_FileSave.png b/share/icons/database/C26_FileSave.png
index fd0048ded9..0d87f2531a 100644
Binary files a/share/icons/database/C26_FileSave.png and b/share/icons/database/C26_FileSave.png differ
diff --git a/share/icons/database/C27_NFS_Unmount.png b/share/icons/database/C27_NFS_Unmount.png
index f6a8dd54a4..4c52384617 100644
Binary files a/share/icons/database/C27_NFS_Unmount.png and b/share/icons/database/C27_NFS_Unmount.png differ
diff --git a/share/icons/database/C28_QuickTime.png b/share/icons/database/C28_QuickTime.png
index f0bc57a03e..59a1694912 100644
Binary files a/share/icons/database/C28_QuickTime.png and b/share/icons/database/C28_QuickTime.png differ
diff --git a/share/icons/database/C29_KGPG_Term.png b/share/icons/database/C29_KGPG_Term.png
index e77ff5b0d2..010d33570b 100644
Binary files a/share/icons/database/C29_KGPG_Term.png and b/share/icons/database/C29_KGPG_Term.png differ
diff --git a/share/icons/database/C30_Konsole.png b/share/icons/database/C30_Konsole.png
index b1366b1f05..292df84ced 100644
Binary files a/share/icons/database/C30_Konsole.png and b/share/icons/database/C30_Konsole.png differ
diff --git a/share/icons/database/C31_FilePrint.png b/share/icons/database/C31_FilePrint.png
index 3a87543224..4ff0f127c1 100644
Binary files a/share/icons/database/C31_FilePrint.png and b/share/icons/database/C31_FilePrint.png differ
diff --git a/share/icons/database/C32_FSView.png b/share/icons/database/C32_FSView.png
index e167acf205..53dda269ab 100644
Binary files a/share/icons/database/C32_FSView.png and b/share/icons/database/C32_FSView.png differ
diff --git a/share/icons/database/C33_Run.png b/share/icons/database/C33_Run.png
index 751424557e..522b0a3f93 100644
Binary files a/share/icons/database/C33_Run.png and b/share/icons/database/C33_Run.png differ
diff --git a/share/icons/database/C34_Configure.png b/share/icons/database/C34_Configure.png
index a4a3834abc..5314140ec6 100644
Binary files a/share/icons/database/C34_Configure.png and b/share/icons/database/C34_Configure.png differ
diff --git a/share/icons/database/C35_KRFB.png b/share/icons/database/C35_KRFB.png
index 6f02e877ec..b518beebd6 100644
Binary files a/share/icons/database/C35_KRFB.png and b/share/icons/database/C35_KRFB.png differ
diff --git a/share/icons/database/C36_Ark.png b/share/icons/database/C36_Ark.png
index e2b67dcba2..e30bb09b90 100644
Binary files a/share/icons/database/C36_Ark.png and b/share/icons/database/C36_Ark.png differ
diff --git a/share/icons/database/C37_KPercentage.png b/share/icons/database/C37_KPercentage.png
index 2a15a078c6..64995d2de0 100644
Binary files a/share/icons/database/C37_KPercentage.png and b/share/icons/database/C37_KPercentage.png differ
diff --git a/share/icons/database/C38_Samba_Unmount.png b/share/icons/database/C38_Samba_Unmount.png
index 3f3b8ff0f9..4112a4f631 100644
Binary files a/share/icons/database/C38_Samba_Unmount.png and b/share/icons/database/C38_Samba_Unmount.png differ
diff --git a/share/icons/database/C39_History.png b/share/icons/database/C39_History.png
index 8d658e0de0..95e7d6e8ed 100644
Binary files a/share/icons/database/C39_History.png and b/share/icons/database/C39_History.png differ
diff --git a/share/icons/database/C40_Mail_Find.png b/share/icons/database/C40_Mail_Find.png
index 1e230e2e40..6dfbb958d7 100644
Binary files a/share/icons/database/C40_Mail_Find.png and b/share/icons/database/C40_Mail_Find.png differ
diff --git a/share/icons/database/C41_VectorGfx.png b/share/icons/database/C41_VectorGfx.png
index 5b51008bd7..ec47b76e3e 100644
Binary files a/share/icons/database/C41_VectorGfx.png and b/share/icons/database/C41_VectorGfx.png differ
diff --git a/share/icons/database/C42_KCMMemory.png b/share/icons/database/C42_KCMMemory.png
index c74903467b..ee2560a023 100644
Binary files a/share/icons/database/C42_KCMMemory.png and b/share/icons/database/C42_KCMMemory.png differ
diff --git a/share/icons/database/C43_EditTrash.png b/share/icons/database/C43_EditTrash.png
index aa9d7321f9..d09e079356 100644
Binary files a/share/icons/database/C43_EditTrash.png and b/share/icons/database/C43_EditTrash.png differ
diff --git a/share/icons/database/C44_KNotes.png b/share/icons/database/C44_KNotes.png
index 1e27e9cae7..f981a9a471 100644
Binary files a/share/icons/database/C44_KNotes.png and b/share/icons/database/C44_KNotes.png differ
diff --git a/share/icons/database/C45_Cancel.png b/share/icons/database/C45_Cancel.png
index a432b492c4..443450f090 100644
Binary files a/share/icons/database/C45_Cancel.png and b/share/icons/database/C45_Cancel.png differ
diff --git a/share/icons/database/C46_Help.png b/share/icons/database/C46_Help.png
index 28a0f9e5e6..fc50cff740 100644
Binary files a/share/icons/database/C46_Help.png and b/share/icons/database/C46_Help.png differ
diff --git a/share/icons/database/C47_KPackage.png b/share/icons/database/C47_KPackage.png
index fdb3644c6c..ac5d51789b 100644
Binary files a/share/icons/database/C47_KPackage.png and b/share/icons/database/C47_KPackage.png differ
diff --git a/share/icons/database/C48_Folder.png b/share/icons/database/C48_Folder.png
index 9232553fcd..e648b3fecb 100644
Binary files a/share/icons/database/C48_Folder.png and b/share/icons/database/C48_Folder.png differ
diff --git a/share/icons/database/C49_Folder_Blue_Open.png b/share/icons/database/C49_Folder_Blue_Open.png
index 2c55c5636e..baba6e00e8 100644
Binary files a/share/icons/database/C49_Folder_Blue_Open.png and b/share/icons/database/C49_Folder_Blue_Open.png differ
diff --git a/share/icons/database/C50_Folder_Tar.png b/share/icons/database/C50_Folder_Tar.png
index 2effa3950f..69f1c455d8 100644
Binary files a/share/icons/database/C50_Folder_Tar.png and b/share/icons/database/C50_Folder_Tar.png differ
diff --git a/share/icons/database/C51_Decrypted.png b/share/icons/database/C51_Decrypted.png
index 42dd93e266..1e239a7cc8 100644
Binary files a/share/icons/database/C51_Decrypted.png and b/share/icons/database/C51_Decrypted.png differ
diff --git a/share/icons/database/C52_Encrypted.png b/share/icons/database/C52_Encrypted.png
index 80357125c2..e1edec451b 100644
Binary files a/share/icons/database/C52_Encrypted.png and b/share/icons/database/C52_Encrypted.png differ
diff --git a/share/icons/database/C53_Apply.png b/share/icons/database/C53_Apply.png
index 5b0f6a6174..a2ae9cfc75 100644
Binary files a/share/icons/database/C53_Apply.png and b/share/icons/database/C53_Apply.png differ
diff --git a/share/icons/database/C54_Signature.png b/share/icons/database/C54_Signature.png
index 8834f3f592..ba5ac29dd4 100644
Binary files a/share/icons/database/C54_Signature.png and b/share/icons/database/C54_Signature.png differ
diff --git a/share/icons/database/C55_Thumbnail.png b/share/icons/database/C55_Thumbnail.png
index 91adff8dee..4c3a26d449 100644
Binary files a/share/icons/database/C55_Thumbnail.png and b/share/icons/database/C55_Thumbnail.png differ
diff --git a/share/icons/database/C56_KAddressBook.png b/share/icons/database/C56_KAddressBook.png
index 7f879f8cb5..e24b44ad3b 100644
Binary files a/share/icons/database/C56_KAddressBook.png and b/share/icons/database/C56_KAddressBook.png differ
diff --git a/share/icons/database/C57_View_Text.png b/share/icons/database/C57_View_Text.png
index c688d5f6f9..afaa8132e9 100644
Binary files a/share/icons/database/C57_View_Text.png and b/share/icons/database/C57_View_Text.png differ
diff --git a/share/icons/database/C58_KGPG.png b/share/icons/database/C58_KGPG.png
index a6ed9b4b73..a842c79713 100644
Binary files a/share/icons/database/C58_KGPG.png and b/share/icons/database/C58_KGPG.png differ
diff --git a/share/icons/database/C59_Package_Development.png b/share/icons/database/C59_Package_Development.png
index df1fb742e3..b740c987b3 100644
Binary files a/share/icons/database/C59_Package_Development.png and b/share/icons/database/C59_Package_Development.png differ
diff --git a/share/icons/database/C60_KFM_Home.png b/share/icons/database/C60_KFM_Home.png
index 3525b0b737..8076b8e248 100644
Binary files a/share/icons/database/C60_KFM_Home.png and b/share/icons/database/C60_KFM_Home.png differ
diff --git a/share/icons/database/C61_Services.png b/share/icons/database/C61_Services.png
index 2a24b7e7f6..66478f4ad8 100644
Binary files a/share/icons/database/C61_Services.png and b/share/icons/database/C61_Services.png differ
diff --git a/share/icons/database/C62_Tux.png b/share/icons/database/C62_Tux.png
index 85392b2045..c22c15e2cf 100644
Binary files a/share/icons/database/C62_Tux.png and b/share/icons/database/C62_Tux.png differ
diff --git a/share/icons/database/C63_Feather.png b/share/icons/database/C63_Feather.png
index cf95a5d19f..307deac8a7 100644
Binary files a/share/icons/database/C63_Feather.png and b/share/icons/database/C63_Feather.png differ
diff --git a/share/icons/database/C64_Apple.png b/share/icons/database/C64_Apple.png
index d3b11ee285..d799fec0a6 100644
Binary files a/share/icons/database/C64_Apple.png and b/share/icons/database/C64_Apple.png differ
diff --git a/share/icons/database/C65_W.png b/share/icons/database/C65_W.png
index de84d680b6..d3315b36cd 100644
Binary files a/share/icons/database/C65_W.png and b/share/icons/database/C65_W.png differ
diff --git a/share/icons/database/C66_Money.png b/share/icons/database/C66_Money.png
index 5db755dfab..619cea4b2e 100644
Binary files a/share/icons/database/C66_Money.png and b/share/icons/database/C66_Money.png differ
diff --git a/share/icons/database/C67_Certificate.png b/share/icons/database/C67_Certificate.png
index 2526fbe769..ba7a767993 100644
Binary files a/share/icons/database/C67_Certificate.png and b/share/icons/database/C67_Certificate.png differ
diff --git a/share/icons/database/C68_BlackBerry.png b/share/icons/database/C68_BlackBerry.png
index ddb8630a21..9f7e4db396 100644
Binary files a/share/icons/database/C68_BlackBerry.png and b/share/icons/database/C68_BlackBerry.png differ
diff --git a/share/icons/svg/application-exit.svg b/share/icons/svg/application-exit.svg
index acb802f164..81868b89f2 100644
--- a/share/icons/svg/application-exit.svg
+++ b/share/icons/svg/application-exit.svg
@@ -1,433 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/application-x-keepassxc-16.svg b/share/icons/svg/application-x-keepassxc-16.svg
deleted file mode 100644
index eb248b339c..0000000000
--- a/share/icons/svg/application-x-keepassxc-16.svg
+++ /dev/null
@@ -1,312 +0,0 @@
-
-
diff --git a/share/icons/svg/application-x-keepassxc.svg b/share/icons/svg/application-x-keepassxc.svg
index 0ea2e0b076..4b33c5a69e 100644
Binary files a/share/icons/svg/application-x-keepassxc.svg and b/share/icons/svg/application-x-keepassxc.svg differ
diff --git a/share/icons/svg/auto-type.png b/share/icons/svg/auto-type.png
index 90d13a126c..5e3c425351 100644
Binary files a/share/icons/svg/auto-type.png and b/share/icons/svg/auto-type.png differ
diff --git a/share/icons/svg/configure.svg b/share/icons/svg/configure.svg
index d99c7935c9..ebbb7dca17 100644
--- a/share/icons/svg/configure.svg
+++ b/share/icons/svg/configure.svg
@@ -1,714 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/dialog-information.svg b/share/icons/svg/dialog-information.svg
index f87da59c68..35992e0fca 100644
--- a/share/icons/svg/dialog-information.svg
+++ b/share/icons/svg/dialog-information.svg
@@ -1,800 +1,156 @@
-
-
diff --git a/share/icons/svg/document-open.svg b/share/icons/svg/document-open.svg
index 8e4e46f6ca..c48f769406 100644
--- a/share/icons/svg/document-open.svg
+++ b/share/icons/svg/document-open.svg
@@ -1,27891 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/document-save-as.svg b/share/icons/svg/document-save-as.svg
index 04927a37f6..833ebc6d35 100644
--- a/share/icons/svg/document-save-as.svg
+++ b/share/icons/svg/document-save-as.svg
@@ -1,29035 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/document-save.svg b/share/icons/svg/document-save.svg
index 4cc81b98e4..8e681fdb71 100644
--- a/share/icons/svg/document-save.svg
+++ b/share/icons/svg/document-save.svg
@@ -1,28614 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/internet-web-browser.svg b/share/icons/svg/internet-web-browser.svg
index 2e0ee9184f..0d00ac6dc3 100644
--- a/share/icons/svg/internet-web-browser.svg
+++ b/share/icons/svg/internet-web-browser.svg
@@ -1,4032 +1,4 @@
-
-
diff --git a/share/icons/svg/password-copy.svg b/share/icons/svg/password-copy.svg
index 9ce2a09e1f..8d7e33c02d 100644
--- a/share/icons/svg/password-copy.svg
+++ b/share/icons/svg/password-copy.svg
@@ -1,4262 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/preferences-desktop-icons.svg b/share/icons/svg/preferences-desktop-icons.svg
index b81d180850..3d2fd2006f 100644
--- a/share/icons/svg/preferences-desktop-icons.svg
+++ b/share/icons/svg/preferences-desktop-icons.svg
@@ -1,1444 +1,14 @@
-
-
diff --git a/share/icons/svg/system-search.svg b/share/icons/svg/system-search.svg
index 5143a27c6e..7a4bcbb49e 100644
--- a/share/icons/svg/system-search.svg
+++ b/share/icons/svg/system-search.svg
@@ -1,2398 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/url-copy.svg b/share/icons/svg/url-copy.svg
index 9693f8cf66..1d104240f9 100644
--- a/share/icons/svg/url-copy.svg
+++ b/share/icons/svg/url-copy.svg
@@ -1,4981 +1,2 @@
-
-
+
+
diff --git a/share/icons/svg/username-copy.svg b/share/icons/svg/username-copy.svg
index aaf251b636..3a6f056f26 100644
--- a/share/icons/svg/username-copy.svg
+++ b/share/icons/svg/username-copy.svg
@@ -1,1067 +1,2 @@
-
-
+
+
diff --git a/share/macosx/keepassxc.entitlements b/share/macosx/keepassxc.entitlements
new file mode 100644
index 0000000000..a637055858
--- /dev/null
+++ b/share/macosx/keepassxc.entitlements
@@ -0,0 +1,24 @@
+
+
+
+
+ com.apple.application-identifier
+ org.keepassx.keepassxc
+ com.apple.developer.aps-environment
+ production
+ com.apple.security.network.client
+
+ com.apple.security.app-sandbox
+
+ com.apple.security.print
+
+ com.apple.security.app-sandbox
+
+ keychain-access-groups
+
+ org.keepassx.keepassxc
+
+ com.apple.security.files.user-selected.read-only
+
+
+
\ No newline at end of file
diff --git a/share/macosx/keepassxc.icns b/share/macosx/keepassxc.icns
index dfb98d20d1..02baec7d46 100644
Binary files a/share/macosx/keepassxc.icns and b/share/macosx/keepassxc.icns differ
diff --git a/share/windows/create-ico.sh b/share/windows/create-ico.sh
new file mode 100644
index 0000000000..44ae06a045
--- /dev/null
+++ b/share/windows/create-ico.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+if [[ -z "$1" ]]; then
+ echo "You must include an SVG file to convert!"
+ exit 1
+fi
+
+outfile=$2
+if [[ -z "outfile" ]]; then
+ outfile="logo.ico"
+fi
+
+echo "Generating $outfile from $1..."
+size_list=(16 24 32 48 64 128 256)
+for size in ${size_list[@]}; do
+ inkscape -z -e $size.png -w $size -h $size "$1" >/dev/null 2>/dev/null
+done
+
+images=`printf "%s.png " "${size_list[@]}"`
+convert $images $outfile
+
+rm $images
diff --git a/share/windows/icon.rc b/share/windows/icon.rc
index 42221fe4ed..aa025d85cf 100644
--- a/share/windows/icon.rc
+++ b/share/windows/icon.rc
@@ -1 +1,2 @@
IDI_ICON1 ICON DISCARDABLE "keepassxc.ico"
+IDI_KDBX ICON DISCARDABLE "keepassxc-kdbx.ico"
\ No newline at end of file
diff --git a/share/windows/keepassxc-kdbx.ico b/share/windows/keepassxc-kdbx.ico
new file mode 100644
index 0000000000..0cec1e4ced
Binary files /dev/null and b/share/windows/keepassxc-kdbx.ico differ
diff --git a/share/windows/keepassxc.ico b/share/windows/keepassxc.ico
index a77c8391cc..58ae8c2bae 100644
Binary files a/share/windows/keepassxc.ico and b/share/windows/keepassxc.ico differ
diff --git a/share/windows/wix-patch.xml b/share/windows/wix-patch.xml
index 1c1d222a96..205ffa3524 100644
--- a/share/windows/wix-patch.xml
+++ b/share/windows/wix-patch.xml
@@ -5,4 +5,11 @@
Name="KeePassXC" Icon="ProductIcon.ico"
WorkingDirectory="INSTALL_ROOT" Advertise="yes" />
+
+
+
+
+
+
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3819ab7dfc..110dc606cb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -428,4 +428,10 @@ if(MINGW)
# install CA cert chains
install(FILES ${Qt5_PREFIX}/ssl/certs/ca-bundle.crt DESTINATION "ssl/certs")
+ # install OpenSSL library
+ if(WITH_XC_NETWORKING)
+ find_library(OPENSSL_DLL NAMES libssl-1_1.dll libssl-1_1-x64.dll PATH_SUFFIXES bin)
+ find_library(CRYPTO_DLL NAMES libcrypto-1_1.dll libcrypto-1_1-x64.dll PATH_SUFFIXES bin)
+ install(FILES ${OPENSSL_DLL} ${CRYPTO_DLL} DESTINATION ".")
+ endif()
endif()
diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 788f5d32e5..719683e7f3 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -54,8 +54,7 @@ BrowserService::BrowserService(DatabaseTabWidget* parent)
: m_dbTabWidget(parent)
, m_dialogActive(false)
, m_bringToFrontRequested(false)
- , m_wasMinimized(false)
- , m_wasHidden(false)
+ , m_prevWindowState(WindowState::Normal)
, m_keepassBrowserUUID(Tools::hexToUuid("de887cc3036343b8974b5911b8816224"))
{
// Don't connect the signals when used from DatabaseSettingsWidgetBrowser (parent is nullptr)
@@ -1009,29 +1008,42 @@ bool BrowserService::checkLegacySettings()
void BrowserService::hideWindow() const
{
- if (m_wasMinimized) {
+ if (m_prevWindowState == WindowState::Minimized) {
getMainWindow()->showMinimized();
} else {
#ifdef Q_OS_MACOS
- if (m_wasHidden) {
+ if (m_prevWindowState == WindowState::Hidden) {
macUtils()->hideOwnWindow();
} else {
macUtils()->raiseLastActiveWindow();
}
#else
- getMainWindow()->lower();
+ if (m_prevWindowState == WindowState::Hidden) {
+ getMainWindow()->hideWindow();
+ } else {
+ getMainWindow()->lower();
+ }
#endif
}
}
void BrowserService::raiseWindow(const bool force)
{
- m_wasMinimized = getMainWindow()->isMinimized();
+ m_prevWindowState = WindowState::Normal;
+ if (getMainWindow()->isMinimized()) {
+ m_prevWindowState = WindowState::Minimized;
+ }
#ifdef Q_OS_MACOS
- m_wasHidden = macUtils()->isHidden();
+ if (macUtils()->isHidden()) {
+ m_prevWindowState = WindowState::Hidden;
+ }
macUtils()->raiseOwnWindow();
Tools::wait(500);
#else
+ if (getMainWindow()->isHidden()) {
+ m_prevWindowState = WindowState::Hidden;
+ }
+
if (force) {
getMainWindow()->bringToFront();
}
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index 240fe232c9..b002a9b9a0 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -97,6 +97,13 @@ public slots:
Allowed
};
+ enum WindowState
+ {
+ Normal,
+ Minimized,
+ Hidden
+ };
+
private:
QList sortEntries(QList& pwEntries, const QString& host, const QString& submitUrl);
bool confirmEntries(QList& pwEntriesToConfirm,
@@ -125,8 +132,7 @@ public slots:
DatabaseTabWidget* const m_dbTabWidget;
bool m_dialogActive;
bool m_bringToFrontRequested;
- bool m_wasMinimized;
- bool m_wasHidden;
+ WindowState m_prevWindowState;
QUuid m_keepassBrowserUUID;
};
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 2fd2e8c445..327fdc4255 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -427,14 +427,21 @@ QString Entry::totp() const
void Entry::setTotp(QSharedPointer settings)
{
beginUpdate();
- m_data.totpSettings = std::move(settings);
-
- auto text = Totp::writeSettings(m_data.totpSettings, title(), username());
- if (m_attributes->hasKey(Totp::ATTRIBUTE_OTP)) {
- m_attributes->set(Totp::ATTRIBUTE_OTP, text, true);
+ if (settings->key.isEmpty()) {
+ m_data.totpSettings.reset();
+ m_attributes->remove(Totp::ATTRIBUTE_OTP);
+ m_attributes->remove(Totp::ATTRIBUTE_SEED);
+ m_attributes->remove(Totp::ATTRIBUTE_SETTINGS);
} else {
- m_attributes->set(Totp::ATTRIBUTE_SEED, m_data.totpSettings->key, true);
- m_attributes->set(Totp::ATTRIBUTE_SETTINGS, text);
+ m_data.totpSettings = std::move(settings);
+
+ auto text = Totp::writeSettings(m_data.totpSettings, title(), username());
+ if (m_attributes->hasKey(Totp::ATTRIBUTE_OTP)) {
+ m_attributes->set(Totp::ATTRIBUTE_OTP, text, true);
+ } else {
+ m_attributes->set(Totp::ATTRIBUTE_SEED, m_data.totpSettings->key, true);
+ m_attributes->set(Totp::ATTRIBUTE_SETTINGS, text);
+ }
}
endUpdate();
}
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
index 3a696ae669..bcc08f0fad 100644
--- a/src/core/EntryAttributes.cpp
+++ b/src/core/EntryAttributes.cpp
@@ -137,7 +137,6 @@ void EntryAttributes::remove(const QString& key)
Q_ASSERT(!isDefaultAttribute(key));
if (!m_attributes.contains(key)) {
- Q_ASSERT(false);
return;
}
diff --git a/src/format/KdbxXmlReader.cpp b/src/format/KdbxXmlReader.cpp
index 50c320118c..84d597bdb8 100644
--- a/src/format/KdbxXmlReader.cpp
+++ b/src/format/KdbxXmlReader.cpp
@@ -367,6 +367,10 @@ void KdbxXmlReader::parseIcon()
}
if (uuidSet && iconSet) {
+ // Check for duplicate UUID (corruption)
+ if (m_meta->containsCustomIcon(uuid)) {
+ uuid = QUuid::createUuid();
+ }
m_meta->addCustomIcon(uuid, icon);
return;
}
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index d7aa36e2cd..b3a5a9aade 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1162,7 +1162,7 @@ void MainWindow::hideYubiKeyPopup()
void MainWindow::bringToFront()
{
ensurePolished();
- setWindowState(windowState() & ~Qt::WindowMinimized);
+ setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
show();
raise();
activateWindow();
diff --git a/src/gui/TotpSetupDialog.cpp b/src/gui/TotpSetupDialog.cpp
index ebbcbc9fe4..0e2c8da5a4 100644
--- a/src/gui/TotpSetupDialog.cpp
+++ b/src/gui/TotpSetupDialog.cpp
@@ -45,16 +45,21 @@ void TotpSetupDialog::saveSettings()
{
QString encShortName;
uint digits = Totp::DEFAULT_DIGITS;
- if (m_ui->radio8Digits->isChecked()) {
- digits = 8;
- } else if (m_ui->radio7Digits->isChecked()) {
- digits = 7;
- } else if (m_ui->radioSteam->isChecked()) {
+ uint step = Totp::DEFAULT_STEP;
+
+ if (m_ui->radioSteam->isChecked()) {
digits = Totp::STEAM_DIGITS;
encShortName = Totp::STEAM_SHORTNAME;
+ } else if (m_ui->radioCustom->isChecked()) {
+ step = m_ui->stepSpinBox->value();
+ if (m_ui->radio8Digits->isChecked()) {
+ digits = 8;
+ } else if (m_ui->radio7Digits->isChecked()) {
+ digits = 7;
+ }
}
- auto settings = Totp::createSettings(m_ui->seedEdit->text(), digits, m_ui->stepSpinBox->value(), encShortName);
+ auto settings = Totp::createSettings(m_ui->seedEdit->text(), digits, step, encShortName, m_entry->totpSettings());
m_entry->setTotp(settings);
emit totpUpdated();
close();
diff --git a/src/gui/masterkey/YubiKeyEditWidget.cpp b/src/gui/masterkey/YubiKeyEditWidget.cpp
index 96b06833d9..9ecd918ef1 100644
--- a/src/gui/masterkey/YubiKeyEditWidget.cpp
+++ b/src/gui/masterkey/YubiKeyEditWidget.cpp
@@ -79,9 +79,9 @@ QWidget* YubiKeyEditWidget::componentEditWidget()
// clang-format off
connect(YubiKey::instance(), SIGNAL(detected(int,bool)), SLOT(yubikeyDetected(int,bool)), Qt::QueuedConnection);
- // clang-format on
-
+ connect(YubiKey::instance(), SIGNAL(detectComplete()), SLOT(yubikeyDetectComplete()), Qt::QueuedConnection);
connect(YubiKey::instance(), SIGNAL(notFound()), SLOT(noYubikeyFound()), Qt::QueuedConnection);
+ // clang-format on
pollYubikey();
#endif
@@ -102,9 +102,11 @@ void YubiKeyEditWidget::pollYubikey()
if (!m_compEditWidget) {
return;
}
+
+ m_isDetected = false;
+ m_compUi->comboChallengeResponse->clear();
m_compUi->buttonRedetectYubikey->setEnabled(false);
m_compUi->comboChallengeResponse->setEnabled(false);
- m_compUi->comboChallengeResponse->clear();
m_compUi->yubikeyProgress->setVisible(true);
// YubiKey init is slow, detect asynchronously to not block the UI
@@ -119,12 +121,8 @@ void YubiKeyEditWidget::yubikeyDetected(int slot, bool blocking)
return;
}
YkChallengeResponseKey yk(slot, blocking);
- m_compUi->comboChallengeResponse->clear();
// add detected YubiKey to combo box and encode blocking mode in LSB, slot number in second LSB
m_compUi->comboChallengeResponse->addItem(yk.getName(), QVariant((slot << 1u) | blocking));
- m_compUi->comboChallengeResponse->setEnabled(true);
- m_compUi->buttonRedetectYubikey->setEnabled(true);
- m_compUi->yubikeyProgress->setVisible(false);
m_isDetected = true;
#else
Q_UNUSED(slot);
@@ -132,6 +130,13 @@ void YubiKeyEditWidget::yubikeyDetected(int slot, bool blocking)
#endif
}
+void YubiKeyEditWidget::yubikeyDetectComplete()
+{
+ m_compUi->comboChallengeResponse->setEnabled(true);
+ m_compUi->buttonRedetectYubikey->setEnabled(true);
+ m_compUi->yubikeyProgress->setVisible(false);
+}
+
void YubiKeyEditWidget::noYubikeyFound()
{
#ifdef WITH_XC_YUBIKEY
diff --git a/src/gui/masterkey/YubiKeyEditWidget.h b/src/gui/masterkey/YubiKeyEditWidget.h
index 8d7498034f..549f7f44fd 100644
--- a/src/gui/masterkey/YubiKeyEditWidget.h
+++ b/src/gui/masterkey/YubiKeyEditWidget.h
@@ -46,6 +46,7 @@ class YubiKeyEditWidget : public KeyComponentWidget
private slots:
void yubikeyDetected(int slot, bool blocking);
+ void yubikeyDetectComplete();
void noYubikeyFound();
void pollYubikey();
diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp
index 1660a09908..89352c8ab0 100644
--- a/src/keeshare/ShareObserver.cpp
+++ b/src/keeshare/ShareObserver.cpp
@@ -126,7 +126,7 @@ namespace
} else {
warning.setIcon(QMessageBox::Question);
warning.setWindowTitle(ShareObserver::tr("Import from container with certificate"));
- warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3")
+ warning.setText(ShareObserver::tr("Do you want to trust %1 with the fingerprint of %2 from %3?")
.arg(certificate.signer, certificate.fingerprint(), reference.path));
}
auto untrustedOnce = warning.addButton(ShareObserver::tr("Not this time"), QMessageBox::ButtonRole::NoRole);
diff --git a/src/totp/totp.cpp b/src/totp/totp.cpp
index fef8e0b7e4..7188288a18 100644
--- a/src/totp/totp.cpp
+++ b/src/totp/totp.cpp
@@ -55,10 +55,16 @@ QSharedPointer Totp::parseSettings(const QString& rawSettings, c
QUrlQuery query(rawSettings);
if (query.hasQueryItem("key")) {
// Compatibility with "KeeOtp" plugin
- // if settings are changed, will convert to semi-colon format
+ settings->keeOtp = true;
settings->key = query.queryItemValue("key");
- settings->digits = query.queryItemValue("size").toUInt();
- settings->step = query.queryItemValue("step").toUInt();
+ settings->digits = DEFAULT_DIGITS;
+ settings->step = DEFAULT_STEP;
+ if (query.hasQueryItem("size")) {
+ settings->digits = query.queryItemValue("size").toUInt();
+ }
+ if (query.hasQueryItem("step")) {
+ settings->step = query.queryItemValue("step").toUInt();
+ }
} else {
// Parse semi-colon separated values ([step];[digits|S])
auto vars = rawSettings.split(";");
@@ -88,12 +94,24 @@ QSharedPointer Totp::parseSettings(const QString& rawSettings, c
return settings;
}
-QSharedPointer
-Totp::createSettings(const QString& key, const uint digits, const uint step, const QString& encoderShortName)
+QSharedPointer Totp::createSettings(const QString& key,
+ const uint digits,
+ const uint step,
+ const QString& encoderShortName,
+ QSharedPointer prevSettings)
{
bool isCustom = digits != DEFAULT_DIGITS || step != DEFAULT_STEP;
- return QSharedPointer(
- new Totp::Settings{getEncoderByShortName(encoderShortName), key, false, isCustom, digits, step});
+ if (prevSettings) {
+ prevSettings->key = key;
+ prevSettings->digits = digits;
+ prevSettings->step = step;
+ prevSettings->encoder = Totp::getEncoderByShortName(encoderShortName);
+ prevSettings->custom = isCustom;
+ return prevSettings;
+ } else {
+ return QSharedPointer(
+ new Totp::Settings{getEncoderByShortName(encoderShortName), key, false, false, isCustom, digits, step});
+ }
}
QString Totp::writeSettings(const QSharedPointer& settings,
@@ -118,15 +136,19 @@ QString Totp::writeSettings(const QSharedPointer& settings,
urlstring.append("&encoder=").append(settings->encoder.name);
}
return urlstring;
- }
-
- // Semicolon output [step];[encoder]
- if (!settings->encoder.shortName.isEmpty()) {
+ } else if (settings->keeOtp) {
+ // KeeOtp output
+ return QString("key=%1&size=%2&step=%3")
+ .arg(QString(Base32::sanitizeInput(settings->key.toLatin1())))
+ .arg(settings->digits)
+ .arg(settings->step);
+ } else if (!settings->encoder.shortName.isEmpty()) {
+ // Semicolon output [step];[encoder]
return QString("%1;%2").arg(settings->step).arg(settings->encoder.shortName);
+ } else {
+ // Semicolon output [step];[digits]
+ return QString("%1;%2").arg(settings->step).arg(settings->digits);
}
-
- // Semicolon output [step];[digits]
- return QString("%1;%2").arg(settings->step).arg(settings->digits);
}
QString Totp::generateTotp(const QSharedPointer& settings, const quint64 time)
diff --git a/src/totp/totp.h b/src/totp/totp.h
index 9c90ec5a9f..499973bf9d 100644
--- a/src/totp/totp.h
+++ b/src/totp/totp.h
@@ -44,6 +44,7 @@ namespace Totp
Totp::Encoder encoder;
QString key;
bool otpUrl;
+ bool keeOtp;
bool custom;
uint digits;
uint step;
@@ -59,8 +60,11 @@ namespace Totp
static const QString ATTRIBUTE_SETTINGS = "TOTP Settings";
QSharedPointer parseSettings(const QString& rawSettings, const QString& key = {});
- QSharedPointer
- createSettings(const QString& key, const uint digits, const uint step, const QString& encoderShortName = {});
+ QSharedPointer createSettings(const QString& key,
+ const uint digits,
+ const uint step,
+ const QString& encoderShortName = {},
+ QSharedPointer prevSettings = {});
QString writeSettings(const QSharedPointer& settings,
const QString& title = {},
const QString& username = {},