diff --git a/install.sh b/install.sh
index b2c951fd..b29c319b 100755
--- a/install.sh
+++ b/install.sh
@@ -525,7 +525,7 @@ theme_tweaks() {
 }
 
 uninstall_link() {
-  rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css} && echo -e "\nUninstall ${HOME}/.config/gtk-4.0 links ..."
+  rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css}
 }
 
 link_libadwaita() {
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..d80fc6d4
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..79d9b5da
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..35ec499b
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..419682f6
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..2cb1b08b
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..9a720c23
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..fe129dbb
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..739df1a1
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..add8c231
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..cb4eb55c
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..7483ed6b
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..9c5d5f1e
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..f25daf3e
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..9c391262
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..8da8fe48
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..dc09f568
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..3a3fb4ed
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..271efd98
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..899b18ec
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..af36dea1
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Dracula/shade-toggled-active.png b/src/assets/xfwm4/assets-Dracula/shade-toggled-active.png
new file mode 100644
index 00000000..e98a2513
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Dracula/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Dracula/shade-toggled-inactive.png
new file mode 100644
index 00000000..67e2ce0f
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Dracula/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Dracula/shade-toggled-prelight.png
new file mode 100644
index 00000000..b036842a
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Dracula/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Dracula/shade-toggled-pressed.png
new file mode 100644
index 00000000..3d728bd7
Binary files /dev/null and b/src/assets/xfwm4/assets-Dracula/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..e6312927
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..5e07d733
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..a64d6e5b
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..96e98f75
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..e5c8c588
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..46b08c73
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..58990135
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..243fefa9
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..f216b0e7
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..a6b217c3
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..bdfade44
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..143d66b3
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..0d65097c
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..d694689a
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..94b13c8f
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..d779d13d
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..a3fddd22
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..63734475
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..891a82e4
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..425e44e7
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox/shade-toggled-active.png b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-active.png
new file mode 100644
index 00000000..76b42f77
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-inactive.png
new file mode 100644
index 00000000..c8c51a32
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-prelight.png
new file mode 100644
index 00000000..d7849d33
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Gruvbox/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-pressed.png
new file mode 100644
index 00000000..b268bb49
Binary files /dev/null and b/src/assets/xfwm4/assets-Gruvbox/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..3593fdc9
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..d440b1c9
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..d25cf9a3
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..46c83bb4
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..8b701d84
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..c1e9de46
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..2ce7c40d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..3421940c
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..efacc618
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..e1c6c86d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..b237cd85
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..001431b2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..32de29ca
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..19927b72
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..9f4e4b8b
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..f25202b2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..5a31c3fd
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..c0cdd820
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..068fe766
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..58dbce64
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-active.png
new file mode 100644
index 00000000..9d0e1e00
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-inactive.png
new file mode 100644
index 00000000..94cf3b8e
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-prelight.png
new file mode 100644
index 00000000..5f8ce038
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-pressed.png
new file mode 100644
index 00000000..e8751c13
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Dracula/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..96c44cc7
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..9eb40afe
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..0c0dc873
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..8e79e136
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..8d8bb9e9
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..efab9bab
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..8f866194
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..e3fe435c
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..3e2dc3d8
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..a5baf019
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..21c23936
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..22ff3f6c
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..980fbbc3
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..348b2139
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..04339cf2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..ed676cfc
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..616811ce
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..b79ecae8
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..ea803f3d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..b2ef0b6f
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-active.png
new file mode 100644
index 00000000..a5698ba2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-inactive.png
new file mode 100644
index 00000000..36608ff4
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-prelight.png
new file mode 100644
index 00000000..76f9eabd
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-pressed.png
new file mode 100644
index 00000000..92002003
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Gruvbox/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..30edb80a
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..09b9b712
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..18cbbaf7
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..8365e625
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..118d3c6e
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..77262037
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..833926d5
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..9e6e912d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..0d00e6f9
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..b8cae5b2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..b73c0b0e
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..18df08ab
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..32de29ca
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..7bebbc83
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..9f4e4b8b
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..f25202b2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..5a31c3fd
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..9e515776
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..068fe766
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..58dbce64
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-active.png
new file mode 100644
index 00000000..abdd360c
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-inactive.png
new file mode 100644
index 00000000..a13e9eab
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-prelight.png
new file mode 100644
index 00000000..5f8ce038
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Nord/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-pressed.png
new file mode 100644
index 00000000..ff9337f2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Nord/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..d83e8e92
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..dc6bc652
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..c21f7476
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..68696640
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..3701a683
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..0c121336
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..a57d38b0
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..0a34ae55
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..08046cab
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..26083689
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..9886b922
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..33270317
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..fe86f08d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..3e33d20b
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..cf0c0363
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..6b4e84c8
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..6dfa2830
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..e646476d
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..4fc9c736
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..a356ed16
Binary files /dev/null and b/src/assets/xfwm4/assets-Light-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Light/shade-toggled-active.png b/src/assets/xfwm4/assets-Light/shade-toggled-active.png
new file mode 100644
index 00000000..37ded04f
Binary files /dev/null and b/src/assets/xfwm4/assets-Light/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Light/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Light/shade-toggled-inactive.png
new file mode 100644
index 00000000..6a4e853c
Binary files /dev/null and b/src/assets/xfwm4/assets-Light/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Light/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Light/shade-toggled-prelight.png
new file mode 100644
index 00000000..b914080f
Binary files /dev/null and b/src/assets/xfwm4/assets-Light/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Light/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Light/shade-toggled-pressed.png
new file mode 100644
index 00000000..5aab21c2
Binary files /dev/null and b/src/assets/xfwm4/assets-Light/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..f5ab2610
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..d5921b01
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..3d39cbc3
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..d2f5f556
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..9bf2cf6d
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..2e3ac9bb
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..3a42e244
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..86ce9faa
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..da07cf17
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..9cf8d602
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..045e8010
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..72ee3ec0
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..202115e6
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..44304aa4
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..0bd703f2
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..844cc1a0
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..6d0a5f06
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..8e04a383
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..353ac5ae
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..99d57cb4
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Nord/shade-toggled-active.png b/src/assets/xfwm4/assets-Nord/shade-toggled-active.png
new file mode 100644
index 00000000..cb6cb411
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Nord/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Nord/shade-toggled-inactive.png
new file mode 100644
index 00000000..a9f36d28
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Nord/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Nord/shade-toggled-prelight.png
new file mode 100644
index 00000000..b72afce2
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Nord/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Nord/shade-toggled-pressed.png
new file mode 100644
index 00000000..6509b8bc
Binary files /dev/null and b/src/assets/xfwm4/assets-Nord/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..80548a71
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..c1595fd7
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..ef5fe832
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..159c5ea8
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..72588b2c
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..126c64b6
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..ce6fd470
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..a8a131dc
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-Normal/shade-toggled-active.png b/src/assets/xfwm4/assets-Normal/shade-toggled-active.png
new file mode 100644
index 00000000..8fb371af
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-Normal/shade-toggled-inactive.png b/src/assets/xfwm4/assets-Normal/shade-toggled-inactive.png
new file mode 100644
index 00000000..22bf54bc
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-Normal/shade-toggled-prelight.png b/src/assets/xfwm4/assets-Normal/shade-toggled-prelight.png
new file mode 100644
index 00000000..42e0a104
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-Normal/shade-toggled-pressed.png b/src/assets/xfwm4/assets-Normal/shade-toggled-pressed.png
new file mode 100644
index 00000000..cf8cb38b
Binary files /dev/null and b/src/assets/xfwm4/assets-Normal/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-hdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-hdpi/shade-toggled-active.png
new file mode 100644
index 00000000..e0c1330a
Binary files /dev/null and b/src/assets/xfwm4/assets-hdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-hdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-hdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..d36c044b
Binary files /dev/null and b/src/assets/xfwm4/assets-hdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-hdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-hdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..10bbd23d
Binary files /dev/null and b/src/assets/xfwm4/assets-hdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-hdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-hdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..b6033865
Binary files /dev/null and b/src/assets/xfwm4/assets-hdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets-xhdpi/shade-toggled-active.png b/src/assets/xfwm4/assets-xhdpi/shade-toggled-active.png
new file mode 100644
index 00000000..1caaf024
Binary files /dev/null and b/src/assets/xfwm4/assets-xhdpi/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets-xhdpi/shade-toggled-inactive.png b/src/assets/xfwm4/assets-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 00000000..b31dd523
Binary files /dev/null and b/src/assets/xfwm4/assets-xhdpi/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets-xhdpi/shade-toggled-prelight.png b/src/assets/xfwm4/assets-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 00000000..486928ad
Binary files /dev/null and b/src/assets/xfwm4/assets-xhdpi/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets-xhdpi/shade-toggled-pressed.png b/src/assets/xfwm4/assets-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 00000000..7dca88b6
Binary files /dev/null and b/src/assets/xfwm4/assets-xhdpi/shade-toggled-pressed.png differ
diff --git a/src/assets/xfwm4/assets.txt b/src/assets/xfwm4/assets.txt
index 4cb28960..a25776e1 100644
--- a/src/assets/xfwm4/assets.txt
+++ b/src/assets/xfwm4/assets.txt
@@ -22,6 +22,10 @@ shade-active
 shade-inactive
 shade-prelight
 shade-pressed
+shade-toggled-active
+shade-toggled-inactive
+shade-toggled-prelight
+shade-toggled-pressed
 stick-active
 stick-inactive
 stick-prelight
diff --git a/src/assets/xfwm4/assets/shade-toggled-active.png b/src/assets/xfwm4/assets/shade-toggled-active.png
new file mode 100644
index 00000000..c28423e9
Binary files /dev/null and b/src/assets/xfwm4/assets/shade-toggled-active.png differ
diff --git a/src/assets/xfwm4/assets/shade-toggled-inactive.png b/src/assets/xfwm4/assets/shade-toggled-inactive.png
new file mode 100644
index 00000000..368e7446
Binary files /dev/null and b/src/assets/xfwm4/assets/shade-toggled-inactive.png differ
diff --git a/src/assets/xfwm4/assets/shade-toggled-prelight.png b/src/assets/xfwm4/assets/shade-toggled-prelight.png
new file mode 100644
index 00000000..8acb32ae
Binary files /dev/null and b/src/assets/xfwm4/assets/shade-toggled-prelight.png differ
diff --git a/src/assets/xfwm4/assets/shade-toggled-pressed.png b/src/assets/xfwm4/assets/shade-toggled-pressed.png
new file mode 100644
index 00000000..3c88a1fb
Binary files /dev/null and b/src/assets/xfwm4/assets/shade-toggled-pressed.png differ
diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
index 06236f97..99893f2a 100644
--- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss
@@ -26,7 +26,7 @@
     box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.25);
     border-radius: $circular_radius;
     margin: 2px;
-    padding: 0.2em 0.6em;
+    padding: 0.25em 0.6em;
     font-weight: bold;
     text-align: center;
   }
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 02a1dda3..6bd400c3 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1384,7 +1384,8 @@ headerbar {
   // add vertical margins to common widget on the headerbar to avoid them spanning the whole height
   entry,
   spinbutton,
-  button {
+  button,
+  stackswitcher {
     margin-top: $space-size;
     margin-bottom: $space-size;
   }
@@ -2963,6 +2964,10 @@ list {
       border-radius: $corner-radius;
     }
   }
+
+  paned scrolledwindow > viewport.frame > & {
+    background-color: transparent;
+  }
 }
 
 row {
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index ce8fbad3..231bcdbc 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1688,9 +1688,15 @@ headerbar {
   &.default-decoration {
     min-height: $medium-size;
     padding: 0;
+    margin: 0;
     box-shadow: none;
     border: none;
     outline: none;
+    background-image: image($titlebar);
+  
+    &:backdrop {
+      background-image: image($titlebar-backdrop);
+    }
 
     windowcontrols {
       button,