diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/themerc b/share/themes/Kali-Dark-HiDPI/xfwm4/themerc
index 71dc5421..fa383b5a 100644
--- a/share/themes/Kali-Dark-HiDPI/xfwm4/themerc
+++ b/share/themes/Kali-Dark-HiDPI/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#fff
 inactive_text_color=#8c8f94
-button_offset=0
+button_offset=1
 button_spacing=6
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-active.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-inactive.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-active.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-inactive.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-active.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-inactive.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-active.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-inactive.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-active.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-inactive.png
index a1726439..fd49873a 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-active.png
index 04866b46..432dc5c5 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-inactive.png
index 04866b46..432dc5c5 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-active.png b/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-active.png
index 368cf4e9..82ff153f 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-active.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-inactive.png b/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-inactive.png
index 368cf4e9..82ff153f 100644
Binary files a/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-inactive.png and b/share/themes/Kali-Dark-HiDPI/xfwm4/top-right-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/themerc b/share/themes/Kali-Dark-xHiDPI/xfwm4/themerc
index 6062b741..b71b2ade 100644
--- a/share/themes/Kali-Dark-xHiDPI/xfwm4/themerc
+++ b/share/themes/Kali-Dark-xHiDPI/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#fff
 inactive_text_color=#8c8f94
-button_offset=0
+button_offset=2
 button_spacing=8
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-active.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-inactive.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-active.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-inactive.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-active.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-inactive.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-active.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-inactive.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-active.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-inactive.png
index 42d731dc..daf5d50e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-active.png
index a18055bc..e8e5800d 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-inactive.png
index a18055bc..e8e5800d 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-active.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-active.png
index 0904ab15..0b93dd1e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-active.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-inactive.png b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-inactive.png
index 0904ab15..0b93dd1e 100644
Binary files a/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-inactive.png and b/share/themes/Kali-Dark-xHiDPI/xfwm4/top-right-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/themerc b/share/themes/Kali-Dark/xfwm4/themerc
index 783d05ac..d8301d1c 100644
--- a/share/themes/Kali-Dark/xfwm4/themerc
+++ b/share/themes/Kali-Dark/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#fff
 inactive_text_color=#8c8f94
-button_offset=0
+button_offset=1
 button_spacing=4
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Dark/xfwm4/title-1-active.png b/share/themes/Kali-Dark/xfwm4/title-1-active.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-1-active.png and b/share/themes/Kali-Dark/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-1-inactive.png b/share/themes/Kali-Dark/xfwm4/title-1-inactive.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-1-inactive.png and b/share/themes/Kali-Dark/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-2-active.png b/share/themes/Kali-Dark/xfwm4/title-2-active.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-2-active.png and b/share/themes/Kali-Dark/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-2-inactive.png b/share/themes/Kali-Dark/xfwm4/title-2-inactive.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-2-inactive.png and b/share/themes/Kali-Dark/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-3-active.png b/share/themes/Kali-Dark/xfwm4/title-3-active.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-3-active.png and b/share/themes/Kali-Dark/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-3-inactive.png b/share/themes/Kali-Dark/xfwm4/title-3-inactive.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-3-inactive.png and b/share/themes/Kali-Dark/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-4-active.png b/share/themes/Kali-Dark/xfwm4/title-4-active.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-4-active.png and b/share/themes/Kali-Dark/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-4-inactive.png b/share/themes/Kali-Dark/xfwm4/title-4-inactive.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-4-inactive.png and b/share/themes/Kali-Dark/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-5-active.png b/share/themes/Kali-Dark/xfwm4/title-5-active.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-5-active.png and b/share/themes/Kali-Dark/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/title-5-inactive.png b/share/themes/Kali-Dark/xfwm4/title-5-inactive.png
index e222f58f..1ebdda8b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/title-5-inactive.png and b/share/themes/Kali-Dark/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/top-left-active.png b/share/themes/Kali-Dark/xfwm4/top-left-active.png
index 30636cea..72757ca7 100644
Binary files a/share/themes/Kali-Dark/xfwm4/top-left-active.png and b/share/themes/Kali-Dark/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/top-left-inactive.png b/share/themes/Kali-Dark/xfwm4/top-left-inactive.png
index 30636cea..72757ca7 100644
Binary files a/share/themes/Kali-Dark/xfwm4/top-left-inactive.png and b/share/themes/Kali-Dark/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/top-right-active.png b/share/themes/Kali-Dark/xfwm4/top-right-active.png
index 2e27505f..2d4f732b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/top-right-active.png and b/share/themes/Kali-Dark/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Dark/xfwm4/top-right-inactive.png b/share/themes/Kali-Dark/xfwm4/top-right-inactive.png
index 2e27505f..2d4f732b 100644
Binary files a/share/themes/Kali-Dark/xfwm4/top-right-inactive.png and b/share/themes/Kali-Dark/xfwm4/top-right-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/themerc b/share/themes/Kali-Light-HiDPI/xfwm4/themerc
index 290a1603..bea92745 100644
--- a/share/themes/Kali-Light-HiDPI/xfwm4/themerc
+++ b/share/themes/Kali-Light-HiDPI/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#000
 inactive_text_color=#8d8d8d
-button_offset=0
+button_offset=1
 button_spacing=6
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-1-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-1-active.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-1-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-1-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-1-inactive.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-1-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-2-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-2-active.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-2-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-2-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-2-inactive.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-2-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-3-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-3-active.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-3-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-3-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-3-inactive.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-3-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-4-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-4-active.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-4-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-4-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-4-inactive.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-4-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-5-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-5-active.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-5-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/title-5-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/title-5-inactive.png
index 868b14f9..8241f353 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/title-5-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/top-left-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/top-left-active.png
index 63c477d0..5b0a0899 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/top-left-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/top-left-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/top-left-inactive.png
index 63c477d0..5b0a0899 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/top-left-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/top-right-active.png b/share/themes/Kali-Light-HiDPI/xfwm4/top-right-active.png
index 5b6f1552..bbfa2027 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/top-right-active.png and b/share/themes/Kali-Light-HiDPI/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Light-HiDPI/xfwm4/top-right-inactive.png b/share/themes/Kali-Light-HiDPI/xfwm4/top-right-inactive.png
index 5b6f1552..bbfa2027 100644
Binary files a/share/themes/Kali-Light-HiDPI/xfwm4/top-right-inactive.png and b/share/themes/Kali-Light-HiDPI/xfwm4/top-right-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/themerc b/share/themes/Kali-Light-xHiDPI/xfwm4/themerc
index 9bc54f75..4683d357 100644
--- a/share/themes/Kali-Light-xHiDPI/xfwm4/themerc
+++ b/share/themes/Kali-Light-xHiDPI/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#000
 inactive_text_color=#8d8d8d
-button_offset=0
+button_offset=2
 button_spacing=8
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-active.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-inactive.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-active.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-inactive.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-active.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-inactive.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-active.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-inactive.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-active.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-inactive.png
index 184d080d..7275b792 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-active.png
index 13ece311..9bbd814d 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-inactive.png
index 13ece311..9bbd814d 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-active.png b/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-active.png
index aa6393b0..d821b4a6 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-active.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-inactive.png b/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-inactive.png
index aa6393b0..d821b4a6 100644
Binary files a/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-inactive.png and b/share/themes/Kali-Light-xHiDPI/xfwm4/top-right-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/themerc b/share/themes/Kali-Light/xfwm4/themerc
index 5d674614..a70162bc 100644
--- a/share/themes/Kali-Light/xfwm4/themerc
+++ b/share/themes/Kali-Light/xfwm4/themerc
@@ -1,6 +1,6 @@
 active_text_color=#000
 inactive_text_color=#8d8d8d
-button_offset=0
+button_offset=1
 button_spacing=4
 show_app_icon=true
 full_width_title=true
diff --git a/share/themes/Kali-Light/xfwm4/title-1-active.png b/share/themes/Kali-Light/xfwm4/title-1-active.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-1-active.png and b/share/themes/Kali-Light/xfwm4/title-1-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-1-inactive.png b/share/themes/Kali-Light/xfwm4/title-1-inactive.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-1-inactive.png and b/share/themes/Kali-Light/xfwm4/title-1-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-2-active.png b/share/themes/Kali-Light/xfwm4/title-2-active.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-2-active.png and b/share/themes/Kali-Light/xfwm4/title-2-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-2-inactive.png b/share/themes/Kali-Light/xfwm4/title-2-inactive.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-2-inactive.png and b/share/themes/Kali-Light/xfwm4/title-2-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-3-active.png b/share/themes/Kali-Light/xfwm4/title-3-active.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-3-active.png and b/share/themes/Kali-Light/xfwm4/title-3-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-3-inactive.png b/share/themes/Kali-Light/xfwm4/title-3-inactive.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-3-inactive.png and b/share/themes/Kali-Light/xfwm4/title-3-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-4-active.png b/share/themes/Kali-Light/xfwm4/title-4-active.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-4-active.png and b/share/themes/Kali-Light/xfwm4/title-4-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-4-inactive.png b/share/themes/Kali-Light/xfwm4/title-4-inactive.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-4-inactive.png and b/share/themes/Kali-Light/xfwm4/title-4-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-5-active.png b/share/themes/Kali-Light/xfwm4/title-5-active.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-5-active.png and b/share/themes/Kali-Light/xfwm4/title-5-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/title-5-inactive.png b/share/themes/Kali-Light/xfwm4/title-5-inactive.png
index 273bd3cb..79536e93 100644
Binary files a/share/themes/Kali-Light/xfwm4/title-5-inactive.png and b/share/themes/Kali-Light/xfwm4/title-5-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/top-left-active.png b/share/themes/Kali-Light/xfwm4/top-left-active.png
index f8b62788..4d2392a3 100644
Binary files a/share/themes/Kali-Light/xfwm4/top-left-active.png and b/share/themes/Kali-Light/xfwm4/top-left-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/top-left-inactive.png b/share/themes/Kali-Light/xfwm4/top-left-inactive.png
index f8b62788..4d2392a3 100644
Binary files a/share/themes/Kali-Light/xfwm4/top-left-inactive.png and b/share/themes/Kali-Light/xfwm4/top-left-inactive.png differ
diff --git a/share/themes/Kali-Light/xfwm4/top-right-active.png b/share/themes/Kali-Light/xfwm4/top-right-active.png
index 36b88aa8..e9e154e4 100644
Binary files a/share/themes/Kali-Light/xfwm4/top-right-active.png and b/share/themes/Kali-Light/xfwm4/top-right-active.png differ
diff --git a/share/themes/Kali-Light/xfwm4/top-right-inactive.png b/share/themes/Kali-Light/xfwm4/top-right-inactive.png
index 36b88aa8..e9e154e4 100644
Binary files a/share/themes/Kali-Light/xfwm4/top-right-inactive.png and b/share/themes/Kali-Light/xfwm4/top-right-inactive.png differ