diff --git a/REUSE.toml b/REUSE.toml
index 775329d4fd..af22bcd74b 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -96,7 +96,7 @@ SPDX-FileCopyrightText = "2017 ownCloud GmbH, 2018 Nextcloud GmbH and Nextcloud
SPDX-License-Identifier = "CC-BY-3.0"
[[annotations]]
-path = [".tx/nextcloud.client-desktop/*_translation", "theme/*/state-error.svg", "theme/*/state-info.svg", "theme/*/state-offline.svg", "theme/*/state-ok.svg", "theme/*/state-pause.svg", "theme/*/state-sync.svg", "theme/*/state-warning.svg"]
+path = [".tx/nextcloud.client-desktop/*_translation", "theme/*/state-error.svg", "theme/*/state-info.svg", "theme/*/state-offline.svg", "theme/*/state-ok.svg", "theme/*/state-pause.svg", "theme/*/state-sync.svg", "theme/*/state-warning.svg", "theme/colored/error.svg", "theme/colored/info.svg", "theme/colored/offline.svg", "theme/colored/ok.svg", "theme/colored/pause.svg", "theme/colored/sync.svg", "theme/colored/warning.svg"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2018 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "GPL-2.0-or-later"
diff --git a/shell_integration/icons/1024x1024/oC_a_shared.png b/shell_integration/icons/1024x1024/oC_a_shared.png
index 1e3657e9df..b082ea776f 100644
Binary files a/shell_integration/icons/1024x1024/oC_a_shared.png and b/shell_integration/icons/1024x1024/oC_a_shared.png differ
diff --git a/shell_integration/icons/1024x1024/oC_error.png b/shell_integration/icons/1024x1024/oC_error.png
index 1c46638619..b7d4ab1578 100644
Binary files a/shell_integration/icons/1024x1024/oC_error.png and b/shell_integration/icons/1024x1024/oC_error.png differ
diff --git a/shell_integration/icons/1024x1024/oC_ok.png b/shell_integration/icons/1024x1024/oC_ok.png
index e69a3f8fb1..c778aed728 100644
Binary files a/shell_integration/icons/1024x1024/oC_ok.png and b/shell_integration/icons/1024x1024/oC_ok.png differ
diff --git a/shell_integration/icons/1024x1024/oC_sync.png b/shell_integration/icons/1024x1024/oC_sync.png
index 0d94d77517..fa002ac17f 100644
Binary files a/shell_integration/icons/1024x1024/oC_sync.png and b/shell_integration/icons/1024x1024/oC_sync.png differ
diff --git a/shell_integration/icons/1024x1024/oC_warn.png b/shell_integration/icons/1024x1024/oC_warn.png
index 9204460750..ecd2b286c4 100644
Binary files a/shell_integration/icons/1024x1024/oC_warn.png and b/shell_integration/icons/1024x1024/oC_warn.png differ
diff --git a/shell_integration/icons/128x128/oC_a_shared.png b/shell_integration/icons/128x128/oC_a_shared.png
index 87b082582c..34f4e34f3d 100644
Binary files a/shell_integration/icons/128x128/oC_a_shared.png and b/shell_integration/icons/128x128/oC_a_shared.png differ
diff --git a/shell_integration/icons/128x128/oC_error.png b/shell_integration/icons/128x128/oC_error.png
index 32b9a8e5b2..9966b9f1c1 100644
Binary files a/shell_integration/icons/128x128/oC_error.png and b/shell_integration/icons/128x128/oC_error.png differ
diff --git a/shell_integration/icons/128x128/oC_ok.png b/shell_integration/icons/128x128/oC_ok.png
index 9cf8d6498f..a85edda1c1 100644
Binary files a/shell_integration/icons/128x128/oC_ok.png and b/shell_integration/icons/128x128/oC_ok.png differ
diff --git a/shell_integration/icons/128x128/oC_sync.png b/shell_integration/icons/128x128/oC_sync.png
index 7fb9249bd4..4c0240daf0 100644
Binary files a/shell_integration/icons/128x128/oC_sync.png and b/shell_integration/icons/128x128/oC_sync.png differ
diff --git a/shell_integration/icons/128x128/oC_warn.png b/shell_integration/icons/128x128/oC_warn.png
index 0d0f791eaa..9eae677069 100644
Binary files a/shell_integration/icons/128x128/oC_warn.png and b/shell_integration/icons/128x128/oC_warn.png differ
diff --git a/shell_integration/icons/16x16/oC_a_shared.png b/shell_integration/icons/16x16/oC_a_shared.png
index 66df2eb0a4..7d87221850 100644
Binary files a/shell_integration/icons/16x16/oC_a_shared.png and b/shell_integration/icons/16x16/oC_a_shared.png differ
diff --git a/shell_integration/icons/16x16/oC_error.png b/shell_integration/icons/16x16/oC_error.png
index 475ada2fda..1f80f08ad4 100644
Binary files a/shell_integration/icons/16x16/oC_error.png and b/shell_integration/icons/16x16/oC_error.png differ
diff --git a/shell_integration/icons/16x16/oC_ok.png b/shell_integration/icons/16x16/oC_ok.png
index afc8538af3..e1c676080e 100644
Binary files a/shell_integration/icons/16x16/oC_ok.png and b/shell_integration/icons/16x16/oC_ok.png differ
diff --git a/shell_integration/icons/16x16/oC_sync.png b/shell_integration/icons/16x16/oC_sync.png
index 4db9fa72ca..6c9546ee72 100644
Binary files a/shell_integration/icons/16x16/oC_sync.png and b/shell_integration/icons/16x16/oC_sync.png differ
diff --git a/shell_integration/icons/16x16/oC_warn.png b/shell_integration/icons/16x16/oC_warn.png
index a96022b249..19f39a4764 100644
Binary files a/shell_integration/icons/16x16/oC_warn.png and b/shell_integration/icons/16x16/oC_warn.png differ
diff --git a/shell_integration/icons/256x256/oC_a_shared.png b/shell_integration/icons/256x256/oC_a_shared.png
index 91c20db3a1..778eea8a67 100644
Binary files a/shell_integration/icons/256x256/oC_a_shared.png and b/shell_integration/icons/256x256/oC_a_shared.png differ
diff --git a/shell_integration/icons/256x256/oC_error.png b/shell_integration/icons/256x256/oC_error.png
index d873eb97a8..c50b2fc982 100644
Binary files a/shell_integration/icons/256x256/oC_error.png and b/shell_integration/icons/256x256/oC_error.png differ
diff --git a/shell_integration/icons/256x256/oC_ok.png b/shell_integration/icons/256x256/oC_ok.png
index bb98055e14..596bc7139d 100644
Binary files a/shell_integration/icons/256x256/oC_ok.png and b/shell_integration/icons/256x256/oC_ok.png differ
diff --git a/shell_integration/icons/256x256/oC_sync.png b/shell_integration/icons/256x256/oC_sync.png
index ce64484b6e..8f68fc1352 100644
Binary files a/shell_integration/icons/256x256/oC_sync.png and b/shell_integration/icons/256x256/oC_sync.png differ
diff --git a/shell_integration/icons/256x256/oC_warn.png b/shell_integration/icons/256x256/oC_warn.png
index 0505010773..ba13a1d040 100644
Binary files a/shell_integration/icons/256x256/oC_warn.png and b/shell_integration/icons/256x256/oC_warn.png differ
diff --git a/shell_integration/icons/32x32/oC_a_shared.png b/shell_integration/icons/32x32/oC_a_shared.png
index acd9dcbee5..d47bd1f5b0 100644
Binary files a/shell_integration/icons/32x32/oC_a_shared.png and b/shell_integration/icons/32x32/oC_a_shared.png differ
diff --git a/shell_integration/icons/32x32/oC_error.png b/shell_integration/icons/32x32/oC_error.png
index a7b2cc12b7..bbd7c7ffc7 100644
Binary files a/shell_integration/icons/32x32/oC_error.png and b/shell_integration/icons/32x32/oC_error.png differ
diff --git a/shell_integration/icons/32x32/oC_ok.png b/shell_integration/icons/32x32/oC_ok.png
index 209d305333..4e4ffb0f34 100644
Binary files a/shell_integration/icons/32x32/oC_ok.png and b/shell_integration/icons/32x32/oC_ok.png differ
diff --git a/shell_integration/icons/32x32/oC_sync.png b/shell_integration/icons/32x32/oC_sync.png
index f0f3b4a39c..4fd815ad72 100644
Binary files a/shell_integration/icons/32x32/oC_sync.png and b/shell_integration/icons/32x32/oC_sync.png differ
diff --git a/shell_integration/icons/32x32/oC_warn.png b/shell_integration/icons/32x32/oC_warn.png
index fe7b3f843b..f4934cd394 100644
Binary files a/shell_integration/icons/32x32/oC_warn.png and b/shell_integration/icons/32x32/oC_warn.png differ
diff --git a/shell_integration/icons/48x48/oC_a_shared.png b/shell_integration/icons/48x48/oC_a_shared.png
index f7f8a0928c..2e709f1199 100644
Binary files a/shell_integration/icons/48x48/oC_a_shared.png and b/shell_integration/icons/48x48/oC_a_shared.png differ
diff --git a/shell_integration/icons/48x48/oC_error.png b/shell_integration/icons/48x48/oC_error.png
index c6cf9decc4..eaeeffbffd 100644
Binary files a/shell_integration/icons/48x48/oC_error.png and b/shell_integration/icons/48x48/oC_error.png differ
diff --git a/shell_integration/icons/48x48/oC_ok.png b/shell_integration/icons/48x48/oC_ok.png
index 84361f7536..094ac04145 100644
Binary files a/shell_integration/icons/48x48/oC_ok.png and b/shell_integration/icons/48x48/oC_ok.png differ
diff --git a/shell_integration/icons/48x48/oC_sync.png b/shell_integration/icons/48x48/oC_sync.png
index a9232030ed..6415b0d5ee 100644
Binary files a/shell_integration/icons/48x48/oC_sync.png and b/shell_integration/icons/48x48/oC_sync.png differ
diff --git a/shell_integration/icons/48x48/oC_warn.png b/shell_integration/icons/48x48/oC_warn.png
index d313b5bde6..b7978d828b 100644
Binary files a/shell_integration/icons/48x48/oC_warn.png and b/shell_integration/icons/48x48/oC_warn.png differ
diff --git a/shell_integration/icons/512x512/oC_a_shared.png b/shell_integration/icons/512x512/oC_a_shared.png
index b492839440..3986662698 100644
Binary files a/shell_integration/icons/512x512/oC_a_shared.png and b/shell_integration/icons/512x512/oC_a_shared.png differ
diff --git a/shell_integration/icons/512x512/oC_error.png b/shell_integration/icons/512x512/oC_error.png
index 2d61abe111..22762dcbd1 100644
Binary files a/shell_integration/icons/512x512/oC_error.png and b/shell_integration/icons/512x512/oC_error.png differ
diff --git a/shell_integration/icons/512x512/oC_ok.png b/shell_integration/icons/512x512/oC_ok.png
index b984bb1b77..1de4605bb7 100644
Binary files a/shell_integration/icons/512x512/oC_ok.png and b/shell_integration/icons/512x512/oC_ok.png differ
diff --git a/shell_integration/icons/512x512/oC_sync.png b/shell_integration/icons/512x512/oC_sync.png
index f1493e4874..1a19861a61 100644
Binary files a/shell_integration/icons/512x512/oC_sync.png and b/shell_integration/icons/512x512/oC_sync.png differ
diff --git a/shell_integration/icons/512x512/oC_warn.png b/shell_integration/icons/512x512/oC_warn.png
index 2f160d6d2b..8c58d83681 100644
Binary files a/shell_integration/icons/512x512/oC_warn.png and b/shell_integration/icons/512x512/oC_warn.png differ
diff --git a/shell_integration/icons/64x64/oC_a_shared.png b/shell_integration/icons/64x64/oC_a_shared.png
index 10bc27b2eb..aa0039d344 100644
Binary files a/shell_integration/icons/64x64/oC_a_shared.png and b/shell_integration/icons/64x64/oC_a_shared.png differ
diff --git a/shell_integration/icons/64x64/oC_error.png b/shell_integration/icons/64x64/oC_error.png
index f47ffad72c..d65eba9766 100644
Binary files a/shell_integration/icons/64x64/oC_error.png and b/shell_integration/icons/64x64/oC_error.png differ
diff --git a/shell_integration/icons/64x64/oC_ok.png b/shell_integration/icons/64x64/oC_ok.png
index c9c21f527a..b2eb7dd1d2 100644
Binary files a/shell_integration/icons/64x64/oC_ok.png and b/shell_integration/icons/64x64/oC_ok.png differ
diff --git a/shell_integration/icons/64x64/oC_sync.png b/shell_integration/icons/64x64/oC_sync.png
index 846b2c2ca2..1fe039a527 100644
Binary files a/shell_integration/icons/64x64/oC_sync.png and b/shell_integration/icons/64x64/oC_sync.png differ
diff --git a/shell_integration/icons/64x64/oC_warn.png b/shell_integration/icons/64x64/oC_warn.png
index 9a90b19c82..3e342283e0 100644
Binary files a/shell_integration/icons/64x64/oC_warn.png and b/shell_integration/icons/64x64/oC_warn.png differ
diff --git a/shell_integration/icons/72x72/oC_a_shared.png b/shell_integration/icons/72x72/oC_a_shared.png
index c8bc7ae39d..d25bb7095f 100644
Binary files a/shell_integration/icons/72x72/oC_a_shared.png and b/shell_integration/icons/72x72/oC_a_shared.png differ
diff --git a/shell_integration/icons/72x72/oC_error.png b/shell_integration/icons/72x72/oC_error.png
index 3964ae27e9..b1f396f45b 100644
Binary files a/shell_integration/icons/72x72/oC_error.png and b/shell_integration/icons/72x72/oC_error.png differ
diff --git a/shell_integration/icons/72x72/oC_ok.png b/shell_integration/icons/72x72/oC_ok.png
index a90f821673..7ddcfb8eb7 100644
Binary files a/shell_integration/icons/72x72/oC_ok.png and b/shell_integration/icons/72x72/oC_ok.png differ
diff --git a/shell_integration/icons/72x72/oC_sync.png b/shell_integration/icons/72x72/oC_sync.png
index 9cbe30a386..df01162270 100644
Binary files a/shell_integration/icons/72x72/oC_sync.png and b/shell_integration/icons/72x72/oC_sync.png differ
diff --git a/shell_integration/icons/72x72/oC_warn.png b/shell_integration/icons/72x72/oC_warn.png
index a3e421a094..ce77609ff5 100644
Binary files a/shell_integration/icons/72x72/oC_warn.png and b/shell_integration/icons/72x72/oC_warn.png differ
diff --git a/theme/black/state-error.svg b/theme/black/state-error.svg
index b2b0af2ed2..c1b6998ea7 100644
--- a/theme/black/state-error.svg
+++ b/theme/black/state-error.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/black/state-info.svg b/theme/black/state-info.svg
index ced5c20507..e2ad1a0983 100644
--- a/theme/black/state-info.svg
+++ b/theme/black/state-info.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/theme/black/state-offline.svg b/theme/black/state-offline.svg
index a1336e59f4..5a93060808 100644
--- a/theme/black/state-offline.svg
+++ b/theme/black/state-offline.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/black/state-ok.svg b/theme/black/state-ok.svg
index 1bddfed87b..3d00008da7 100644
--- a/theme/black/state-ok.svg
+++ b/theme/black/state-ok.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/black/state-pause.svg b/theme/black/state-pause.svg
index 7ced894637..7d1b24d93e 100644
--- a/theme/black/state-pause.svg
+++ b/theme/black/state-pause.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/black/state-sync.svg b/theme/black/state-sync.svg
index 7a4c2ceb45..98822ed4e7 100644
--- a/theme/black/state-sync.svg
+++ b/theme/black/state-sync.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/black/state-warning.svg b/theme/black/state-warning.svg
index 55b00ba2a8..ee2c730139 100644
--- a/theme/black/state-warning.svg
+++ b/theme/black/state-warning.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/colored/error.svg b/theme/colored/error.svg
new file mode 100644
index 0000000000..b19f768956
--- /dev/null
+++ b/theme/colored/error.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/info.svg b/theme/colored/info.svg
new file mode 100644
index 0000000000..9ac9700794
--- /dev/null
+++ b/theme/colored/info.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/offline.svg b/theme/colored/offline.svg
new file mode 100644
index 0000000000..f533986a8c
--- /dev/null
+++ b/theme/colored/offline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/ok.svg b/theme/colored/ok.svg
new file mode 100644
index 0000000000..3f1a8f2ec9
--- /dev/null
+++ b/theme/colored/ok.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/pause.svg b/theme/colored/pause.svg
new file mode 100644
index 0000000000..65634cf091
--- /dev/null
+++ b/theme/colored/pause.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/state-error.svg b/theme/colored/state-error.svg
index f6e341aad5..b19f768956 100644
--- a/theme/colored/state-error.svg
+++ b/theme/colored/state-error.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/theme/colored/state-offline.svg b/theme/colored/state-offline.svg
index 60e6bd950d..f533986a8c 100644
--- a/theme/colored/state-offline.svg
+++ b/theme/colored/state-offline.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/colored/state-ok.svg b/theme/colored/state-ok.svg
index 48fc8b9281..3f1a8f2ec9 100644
--- a/theme/colored/state-ok.svg
+++ b/theme/colored/state-ok.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/theme/colored/state-pause.svg b/theme/colored/state-pause.svg
index f2edf258a1..65634cf091 100644
--- a/theme/colored/state-pause.svg
+++ b/theme/colored/state-pause.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/colored/state-sync.svg b/theme/colored/state-sync.svg
index 658d1b40e0..c56831a833 100644
--- a/theme/colored/state-sync.svg
+++ b/theme/colored/state-sync.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/colored/state-warning.svg b/theme/colored/state-warning.svg
index a738cdbc8b..57b24ffbf4 100644
--- a/theme/colored/state-warning.svg
+++ b/theme/colored/state-warning.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/colored/sync.svg b/theme/colored/sync.svg
new file mode 100644
index 0000000000..c56831a833
--- /dev/null
+++ b/theme/colored/sync.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/colored/warning.svg b/theme/colored/warning.svg
new file mode 100644
index 0000000000..57b24ffbf4
--- /dev/null
+++ b/theme/colored/warning.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/theme/white/state-error.svg b/theme/white/state-error.svg
index 6f9243963b..41fe5fc580 100644
--- a/theme/white/state-error.svg
+++ b/theme/white/state-error.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/white/state-info.svg b/theme/white/state-info.svg
index 715fe8bb15..8bbee73a9a 100644
--- a/theme/white/state-info.svg
+++ b/theme/white/state-info.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/theme/white/state-offline.svg b/theme/white/state-offline.svg
index 2462f939a3..fdc5b59c3a 100644
--- a/theme/white/state-offline.svg
+++ b/theme/white/state-offline.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/white/state-ok.svg b/theme/white/state-ok.svg
index f5fc8d133c..ecf54afa37 100644
--- a/theme/white/state-ok.svg
+++ b/theme/white/state-ok.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/white/state-pause.svg b/theme/white/state-pause.svg
index abb6b9fa98..113b118daa 100644
--- a/theme/white/state-pause.svg
+++ b/theme/white/state-pause.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/white/state-sync.svg b/theme/white/state-sync.svg
index 89a559dee7..475b9316a2 100644
--- a/theme/white/state-sync.svg
+++ b/theme/white/state-sync.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/theme/white/state-warning.svg b/theme/white/state-warning.svg
index 1c359c3abc..aa3f03cbcf 100644
--- a/theme/white/state-warning.svg
+++ b/theme/white/state-warning.svg
@@ -1 +1 @@
-
+
\ No newline at end of file