diff --git a/share/icons/application/scalable/apps/keepassxc-dark.svg b/share/icons/application/scalable/apps/keepassxc-dark.svg
new file mode 100644
index 00000000..d296e68f
--- /dev/null
+++ b/share/icons/application/scalable/apps/keepassxc-dark.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/share/icons/application/scalable/apps/keepassxc-dark.svgz b/share/icons/application/scalable/apps/keepassxc-dark.svgz
deleted file mode 100644
index 0f8d75e7..00000000
Binary files a/share/icons/application/scalable/apps/keepassxc-dark.svgz and /dev/null differ
diff --git a/share/icons/application/scalable/apps/keepassxc-locked.svg b/share/icons/application/scalable/apps/keepassxc-locked.svg
new file mode 100644
index 00000000..82e76694
--- /dev/null
+++ b/share/icons/application/scalable/apps/keepassxc-locked.svg
@@ -0,0 +1,97 @@
+
+
diff --git a/share/icons/application/scalable/apps/keepassxc-locked.svgz b/share/icons/application/scalable/apps/keepassxc-locked.svgz
deleted file mode 100644
index 65aca059..00000000
Binary files a/share/icons/application/scalable/apps/keepassxc-locked.svgz and /dev/null differ
diff --git a/share/icons/application/scalable/apps/keepassxc-unlocked.svg b/share/icons/application/scalable/apps/keepassxc-unlocked.svg
new file mode 100644
index 00000000..c2d5758f
--- /dev/null
+++ b/share/icons/application/scalable/apps/keepassxc-unlocked.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/share/icons/application/scalable/apps/keepassxc-unlocked.svgz b/share/icons/application/scalable/apps/keepassxc-unlocked.svgz
deleted file mode 100644
index 84ce1390..00000000
Binary files a/share/icons/application/scalable/apps/keepassxc-unlocked.svgz and /dev/null differ
diff --git a/share/icons/application/scalable/apps/keepassxc.svg b/share/icons/application/scalable/apps/keepassxc.svg
new file mode 100644
index 00000000..c2d5758f
--- /dev/null
+++ b/share/icons/application/scalable/apps/keepassxc.svg
@@ -0,0 +1,77 @@
+
+
diff --git a/share/icons/application/scalable/apps/keepassxc.svgz b/share/icons/application/scalable/apps/keepassxc.svgz
deleted file mode 100644
index 84ce1390..00000000
Binary files a/share/icons/application/scalable/apps/keepassxc.svgz and /dev/null differ
diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
new file mode 100644
index 00000000..58e59609
--- /dev/null
+++ b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
@@ -0,0 +1,377 @@
+
+
diff --git a/share/icons/svg/application-exit.svg b/share/icons/svg/application-exit.svg
new file mode 100644
index 00000000..acb802f1
--- /dev/null
+++ b/share/icons/svg/application-exit.svg
@@ -0,0 +1,433 @@
+
+
diff --git a/share/icons/svg/application-exit.svgz b/share/icons/svg/application-exit.svgz
deleted file mode 100644
index 0ffd56bd..00000000
Binary files a/share/icons/svg/application-exit.svgz and /dev/null differ
diff --git a/share/icons/svg/application-x-keepassxc-16.svg b/share/icons/svg/application-x-keepassxc-16.svg
new file mode 100644
index 00000000..eb248b33
--- /dev/null
+++ b/share/icons/svg/application-x-keepassxc-16.svg
@@ -0,0 +1,312 @@
+
+
diff --git a/share/icons/svg/application-x-keepassxc-16.svgz b/share/icons/svg/application-x-keepassxc-16.svgz
deleted file mode 100644
index 6ee77535..00000000
Binary files a/share/icons/svg/application-x-keepassxc-16.svgz and /dev/null differ
diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz b/share/icons/svg/application-x-keepassxc.svg
similarity index 100%
rename from share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
rename to share/icons/svg/application-x-keepassxc.svg
diff --git a/share/icons/svg/application-x-keepassxc.svgz b/share/icons/svg/application-x-keepassxc.svgz
deleted file mode 100644
index 0ea2e0b0..00000000
Binary files a/share/icons/svg/application-x-keepassxc.svgz and /dev/null differ
diff --git a/share/icons/svg/configure.svg b/share/icons/svg/configure.svg
new file mode 100644
index 00000000..d99c7935
--- /dev/null
+++ b/share/icons/svg/configure.svg
@@ -0,0 +1,714 @@
+
+
diff --git a/share/icons/svg/configure.svgz b/share/icons/svg/configure.svgz
deleted file mode 100644
index 8c04b222..00000000
Binary files a/share/icons/svg/configure.svgz and /dev/null differ
diff --git a/share/icons/svg/dialog-close.svg b/share/icons/svg/dialog-close.svg
new file mode 100644
index 00000000..9b6b717c
--- /dev/null
+++ b/share/icons/svg/dialog-close.svg
@@ -0,0 +1,238 @@
+
+
diff --git a/share/icons/svg/dialog-close.svgz b/share/icons/svg/dialog-close.svgz
deleted file mode 100644
index 0112a242..00000000
Binary files a/share/icons/svg/dialog-close.svgz and /dev/null differ
diff --git a/share/icons/svg/dialog-error.svg b/share/icons/svg/dialog-error.svg
new file mode 100644
index 00000000..b09885d3
--- /dev/null
+++ b/share/icons/svg/dialog-error.svg
@@ -0,0 +1,474 @@
+
+
diff --git a/share/icons/svg/dialog-error.svgz b/share/icons/svg/dialog-error.svgz
deleted file mode 100644
index 545a1ace..00000000
Binary files a/share/icons/svg/dialog-error.svgz and /dev/null differ
diff --git a/share/icons/svg/dialog-information.svg b/share/icons/svg/dialog-information.svg
new file mode 100644
index 00000000..f87da59c
--- /dev/null
+++ b/share/icons/svg/dialog-information.svg
@@ -0,0 +1,2121 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/dialog-information.svgz b/share/icons/svg/dialog-information.svgz
deleted file mode 100644
index d73e7ac5..00000000
Binary files a/share/icons/svg/dialog-information.svgz and /dev/null differ
diff --git a/share/icons/svg/dialog-ok.svg b/share/icons/svg/dialog-ok.svg
new file mode 100644
index 00000000..5ab1fad3
--- /dev/null
+++ b/share/icons/svg/dialog-ok.svg
@@ -0,0 +1,390 @@
+
+
diff --git a/share/icons/svg/dialog-ok.svgz b/share/icons/svg/dialog-ok.svgz
deleted file mode 100644
index e5c74d11..00000000
Binary files a/share/icons/svg/dialog-ok.svgz and /dev/null differ
diff --git a/share/icons/svg/dialog-warning.svg b/share/icons/svg/dialog-warning.svg
new file mode 100644
index 00000000..80e215b6
--- /dev/null
+++ b/share/icons/svg/dialog-warning.svg
@@ -0,0 +1,383 @@
+
+
diff --git a/share/icons/svg/dialog-warning.svgz b/share/icons/svg/dialog-warning.svgz
deleted file mode 100644
index 660e0f4d..00000000
Binary files a/share/icons/svg/dialog-warning.svgz and /dev/null differ
diff --git a/share/icons/svg/document-close.svg b/share/icons/svg/document-close.svg
new file mode 100644
index 00000000..44b4a6be
--- /dev/null
+++ b/share/icons/svg/document-close.svg
@@ -0,0 +1,426 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/document-close.svgz b/share/icons/svg/document-close.svgz
deleted file mode 100644
index dc223c92..00000000
Binary files a/share/icons/svg/document-close.svgz and /dev/null differ
diff --git a/share/icons/svg/document-edit.svg b/share/icons/svg/document-edit.svg
new file mode 100644
index 00000000..4f462832
--- /dev/null
+++ b/share/icons/svg/document-edit.svg
@@ -0,0 +1,634 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/document-edit.svgz b/share/icons/svg/document-edit.svgz
deleted file mode 100644
index 739ebbcc..00000000
Binary files a/share/icons/svg/document-edit.svgz and /dev/null differ
diff --git a/share/icons/svg/document-new.svg b/share/icons/svg/document-new.svg
new file mode 100644
index 00000000..399b5236
--- /dev/null
+++ b/share/icons/svg/document-new.svg
@@ -0,0 +1,477 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/document-new.svgz b/share/icons/svg/document-new.svgz
deleted file mode 100644
index 8b08bf78..00000000
Binary files a/share/icons/svg/document-new.svgz and /dev/null differ
diff --git a/share/icons/svg/document-open.svg b/share/icons/svg/document-open.svg
new file mode 100644
index 00000000..8e4e46f6
--- /dev/null
+++ b/share/icons/svg/document-open.svg
@@ -0,0 +1,27891 @@
+
+
diff --git a/share/icons/svg/document-open.svgz b/share/icons/svg/document-open.svgz
deleted file mode 100644
index 03a6d325..00000000
Binary files a/share/icons/svg/document-open.svgz and /dev/null differ
diff --git a/share/icons/svg/document-properties.svg b/share/icons/svg/document-properties.svg
new file mode 100644
index 00000000..59337c4a
--- /dev/null
+++ b/share/icons/svg/document-properties.svg
@@ -0,0 +1,601 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/document-properties.svgz b/share/icons/svg/document-properties.svgz
deleted file mode 100644
index 7f166d7f..00000000
Binary files a/share/icons/svg/document-properties.svgz and /dev/null differ
diff --git a/share/icons/svg/document-save-as.svg b/share/icons/svg/document-save-as.svg
new file mode 100644
index 00000000..04927a37
--- /dev/null
+++ b/share/icons/svg/document-save-as.svg
@@ -0,0 +1,29035 @@
+
+
diff --git a/share/icons/svg/document-save-as.svgz b/share/icons/svg/document-save-as.svgz
deleted file mode 100644
index 5fdefb8f..00000000
Binary files a/share/icons/svg/document-save-as.svgz and /dev/null differ
diff --git a/share/icons/svg/document-save.svg b/share/icons/svg/document-save.svg
new file mode 100644
index 00000000..4cc81b98
--- /dev/null
+++ b/share/icons/svg/document-save.svg
@@ -0,0 +1,28614 @@
+
+
diff --git a/share/icons/svg/document-save.svgz b/share/icons/svg/document-save.svgz
deleted file mode 100644
index 248589ba..00000000
Binary files a/share/icons/svg/document-save.svgz and /dev/null differ
diff --git a/share/icons/svg/edit-clear-locationbar-ltr.svg b/share/icons/svg/edit-clear-locationbar-ltr.svg
new file mode 100644
index 00000000..010d954a
--- /dev/null
+++ b/share/icons/svg/edit-clear-locationbar-ltr.svg
@@ -0,0 +1,391 @@
+
+
diff --git a/share/icons/svg/edit-clear-locationbar-ltr.svgz b/share/icons/svg/edit-clear-locationbar-ltr.svgz
deleted file mode 100644
index 3b4e2ad9..00000000
Binary files a/share/icons/svg/edit-clear-locationbar-ltr.svgz and /dev/null differ
diff --git a/share/icons/svg/edit-clear-locationbar-rtl.svg b/share/icons/svg/edit-clear-locationbar-rtl.svg
new file mode 100644
index 00000000..d656a0b0
--- /dev/null
+++ b/share/icons/svg/edit-clear-locationbar-rtl.svg
@@ -0,0 +1,380 @@
+
+
diff --git a/share/icons/svg/edit-clear-locationbar-rtl.svgz b/share/icons/svg/edit-clear-locationbar-rtl.svgz
deleted file mode 100644
index 446a06a0..00000000
Binary files a/share/icons/svg/edit-clear-locationbar-rtl.svgz and /dev/null differ
diff --git a/share/icons/svg/internet-web-browser.svg b/share/icons/svg/internet-web-browser.svg
new file mode 100644
index 00000000..2e0ee918
--- /dev/null
+++ b/share/icons/svg/internet-web-browser.svg
@@ -0,0 +1,4032 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/internet-web-browser.svgz b/share/icons/svg/internet-web-browser.svgz
deleted file mode 100644
index f48f1415..00000000
Binary files a/share/icons/svg/internet-web-browser.svgz and /dev/null differ
diff --git a/share/icons/svg/key-enter.svg b/share/icons/svg/key-enter.svg
new file mode 100644
index 00000000..7c983be5
--- /dev/null
+++ b/share/icons/svg/key-enter.svg
@@ -0,0 +1,265 @@
+
+
diff --git a/share/icons/svg/key-enter.svgz b/share/icons/svg/key-enter.svgz
deleted file mode 100644
index 7176b5ac..00000000
Binary files a/share/icons/svg/key-enter.svgz and /dev/null differ
diff --git a/share/icons/svg/message-close.svg b/share/icons/svg/message-close.svg
new file mode 100644
index 00000000..a36700fa
--- /dev/null
+++ b/share/icons/svg/message-close.svg
@@ -0,0 +1,41 @@
+
+
diff --git a/share/icons/svg/message-close.svgz b/share/icons/svg/message-close.svgz
deleted file mode 100644
index e06d8689..00000000
Binary files a/share/icons/svg/message-close.svgz and /dev/null differ
diff --git a/share/icons/svg/paperclip.svg b/share/icons/svg/paperclip.svg
new file mode 100644
index 00000000..ad1b8d61
--- /dev/null
+++ b/share/icons/svg/paperclip.svg
@@ -0,0 +1,108 @@
+
+
diff --git a/share/icons/svg/paperclip.svgz b/share/icons/svg/paperclip.svgz
deleted file mode 100644
index 6c72fd09..00000000
Binary files a/share/icons/svg/paperclip.svgz and /dev/null differ
diff --git a/share/icons/svg/password-copy.svg b/share/icons/svg/password-copy.svg
new file mode 100644
index 00000000..9ce2a09e
--- /dev/null
+++ b/share/icons/svg/password-copy.svg
@@ -0,0 +1,4262 @@
+
+
diff --git a/share/icons/svg/password-copy.svgz b/share/icons/svg/password-copy.svgz
deleted file mode 100644
index 8cb4a441..00000000
Binary files a/share/icons/svg/password-copy.svgz and /dev/null differ
diff --git a/share/icons/svg/password-generator.svgz b/share/icons/svg/password-generator.svg
similarity index 60%
rename from share/icons/svg/password-generator.svgz
rename to share/icons/svg/password-generator.svg
index 7f08089b..440d690a 100644
--- a/share/icons/svg/password-generator.svgz
+++ b/share/icons/svg/password-generator.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/share/icons/svg/preferences-desktop-icons.svg b/share/icons/svg/preferences-desktop-icons.svg
new file mode 100644
index 00000000..b81d1808
--- /dev/null
+++ b/share/icons/svg/preferences-desktop-icons.svg
@@ -0,0 +1,1444 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/preferences-desktop-icons.svgz b/share/icons/svg/preferences-desktop-icons.svgz
deleted file mode 100644
index 1cd0a052..00000000
Binary files a/share/icons/svg/preferences-desktop-icons.svgz and /dev/null differ
diff --git a/share/icons/svg/preferences-other.svg b/share/icons/svg/preferences-other.svg
new file mode 100644
index 00000000..41b0e605
--- /dev/null
+++ b/share/icons/svg/preferences-other.svg
@@ -0,0 +1,1012 @@
+
+
diff --git a/share/icons/svg/preferences-other.svgz b/share/icons/svg/preferences-other.svgz
deleted file mode 100644
index 4abeca37..00000000
Binary files a/share/icons/svg/preferences-other.svgz and /dev/null differ
diff --git a/share/icons/svg/security-high.svg b/share/icons/svg/security-high.svg
new file mode 100644
index 00000000..d5c23d1e
--- /dev/null
+++ b/share/icons/svg/security-high.svg
@@ -0,0 +1,380 @@
+
+
diff --git a/share/icons/svg/security-high.svgz b/share/icons/svg/security-high.svgz
deleted file mode 100644
index 5edee373..00000000
Binary files a/share/icons/svg/security-high.svgz and /dev/null differ
diff --git a/share/icons/svg/system-search.svg b/share/icons/svg/system-search.svg
new file mode 100644
index 00000000..5143a27c
--- /dev/null
+++ b/share/icons/svg/system-search.svg
@@ -0,0 +1,2398 @@
+
+
diff --git a/share/icons/svg/system-search.svgz b/share/icons/svg/system-search.svgz
deleted file mode 100644
index 7a93fbc1..00000000
Binary files a/share/icons/svg/system-search.svgz and /dev/null differ
diff --git a/share/icons/svg/url-copy.svg b/share/icons/svg/url-copy.svg
new file mode 100644
index 00000000..9693f8cf
--- /dev/null
+++ b/share/icons/svg/url-copy.svg
@@ -0,0 +1,4981 @@
+
+
diff --git a/share/icons/svg/url-copy.svgz b/share/icons/svg/url-copy.svgz
deleted file mode 100644
index d6ac421c..00000000
Binary files a/share/icons/svg/url-copy.svgz and /dev/null differ
diff --git a/share/icons/svg/username-copy.svg b/share/icons/svg/username-copy.svg
new file mode 100644
index 00000000..aaf251b6
--- /dev/null
+++ b/share/icons/svg/username-copy.svg
@@ -0,0 +1,1067 @@
+
+
diff --git a/share/icons/svg/username-copy.svgz b/share/icons/svg/username-copy.svgz
deleted file mode 100644
index ebec8c62..00000000
Binary files a/share/icons/svg/username-copy.svgz and /dev/null differ
diff --git a/share/icons/svg/utilities-terminal.svg b/share/icons/svg/utilities-terminal.svg
new file mode 100644
index 00000000..df601b7b
--- /dev/null
+++ b/share/icons/svg/utilities-terminal.svg
@@ -0,0 +1,1517 @@
+
+
diff --git a/share/icons/svg/utilities-terminal.svgz b/share/icons/svg/utilities-terminal.svgz
deleted file mode 100644
index e913402f..00000000
Binary files a/share/icons/svg/utilities-terminal.svgz and /dev/null differ
diff --git a/share/icons/svg/view-history.svg b/share/icons/svg/view-history.svg
new file mode 100644
index 00000000..519a4d3e
--- /dev/null
+++ b/share/icons/svg/view-history.svg
@@ -0,0 +1,753 @@
+
+
\ No newline at end of file
diff --git a/share/icons/svg/view-history.svgz b/share/icons/svg/view-history.svgz
deleted file mode 100644
index fff230f6..00000000
Binary files a/share/icons/svg/view-history.svgz and /dev/null differ