diff --git a/themes/default/README b/themes/default/README
index 08dd9452c8c2124d1f2b434ca0ac827956334c6a..1e9143b42b6a438c81280302c09fafb0f532d1a7 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,7 +1,8 @@
-Welly
------
+Wallis
+------
 
 Simple gradient theme.
 
 Created Mar. 31 2005 by Olivier Fourdan <fourdan@xfce.org>
+Modified Apr. 12 2005 by Olivier Fourdan <fourdan@xfce.org>
 Theme released under GNU GPL license.
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 77cb2d6499b92932438ee89466d84351ae5a8056..468cb38608b4651f0c9b64c1cf9cc9a0655a7cce 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index 77cb2d6499b92932438ee89466d84351ae5a8056..468cb38608b4651f0c9b64c1cf9cc9a0655a7cce 100644
Binary files a/themes/default/bottom-inactive.png and b/themes/default/bottom-inactive.png differ
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 9ad0c62009af3c8ac70cb7d69fd1de8fc0e74f25..6117c2d8d79466d740a7f6f7334412e32c861b0c 100644
Binary files a/themes/default/bottom-left-active.png and b/themes/default/bottom-left-active.png differ
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index ecebd297e67291fc04bc850409a14af5eeeef850..abbd3caa2554acbc8916888205566c8b90a56949 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -7,17 +7,17 @@ static char * bottom_left_active_xpm[] = {
 "@      c #A0A0FF s active_shadow_1",
 "$      c #B0B0B0 s active_mid_2",
 "#      c #C0C0C0 s active_color_2",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
 "@$##############",
 " @##############",
 " @$#############",
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 9ad0c62009af3c8ac70cb7d69fd1de8fc0e74f25..6117c2d8d79466d740a7f6f7334412e32c861b0c 100644
Binary files a/themes/default/bottom-left-inactive.png and b/themes/default/bottom-left-inactive.png differ
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index bd4878101dc3413a6b083f4a2b6e74363a8c81d2..8706adb23c6fc579db7262cbfe224341d2e5ed92 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -7,17 +7,17 @@ static char * bottom_left_inactive_xpm[] = {
 "@      c #A0A0FF s inactive_shadow_1",
 "$      c #B0B0B0 s inactive_mid_2",
 "#      c #C0C0C0 s inactive_color_2",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
-"@####           ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
+"@##             ",
 "@$##############",
 " @##############",
 " @$#############",
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index a954b9e81b63067c71481a2c727d3cac0261931c..0718f06ee5e613d29443116929cc324d4c4736e3 100644
Binary files a/themes/default/bottom-right-active.png and b/themes/default/bottom-right-active.png differ
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 20abdd96dfad50b69126ce7e54f7059b246b838f..46f6ab8d6352be56504cda35efaeabdab18b0048 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -7,17 +7,17 @@ static char * bottom_right_active_xpm[] = {
 "@      c #A0A0FF s active_shadow_1",
 "$      c #B0B0B0 s active_mid_2",
 "#      c #C0C0C0 s active_color_2",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
 "##############$@",
 "##############@ ",
 "#############$@ ",
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index a954b9e81b63067c71481a2c727d3cac0261931c..0718f06ee5e613d29443116929cc324d4c4736e3 100644
Binary files a/themes/default/bottom-right-inactive.png and b/themes/default/bottom-right-inactive.png differ
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 391698df40a043e57600a7563aa36b648cde0521..47a2c434c11db6e3e721b5103e404494998a6308 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -7,17 +7,17 @@ static char * bottom_right_inactive_xpm[] = {
 "@	c #A0A0FF s inactive_shadow_1",
 "$	c #B0B0B0 s inactive_mid_2",
 "#	c #C0C0C0 s inactive_color_2",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
-"           ####@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
+"             ##@",
 "##############$@",
 "##############@ ",
 "#############$@ ",
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 8d6e9bb6fbe85436d5529fca79ccd67a9c824b91..e814004f54eb659dfdf6fe09dc1162ba400d1fbf 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * close_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 1e7175d1a676b79c4ff1fbae3f347aae4688f8ff..86c55e1154992d565cf4c6acd625f16ff96f50b0 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * close_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index d540361853072e600bc4d3cac158362fe998656b..dc528c016019c73e62061f6813fd6f52b44c04e6 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * close_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 6cff359f6c3148a0d52890405b21811deda20abf..5c9f718134643766b5b4846ceac21246d197ff09 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * hide_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 711b6a71f9ab5624605aa2e1032e1dd780c43cd6..e7a93ee218f7716c1107621f2707658969999de9 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * hide_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index cb9d51c16c5e971389831a2594bb29803107c9a8..edea91d8d7dbde7667336f5f30a99de8a943d2d8 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * hide_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index 70965c0f6ecd291954924033f91ae635a90a00a3..77c252cadb96b46aa6ab6ae27afad813cf668f42 100644
Binary files a/themes/default/left-active.png and b/themes/default/left-active.png differ
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 24122fcb4d35107ca6c7cbec4761e8fb0d691cb1..ffb9e391c68f9b77eee07f28102d5f037bb02bf9 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,41 +1,41 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"5 32 6 1",
+"3 32 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0D0 s active_hilight_2",
 "@	c #A0A0FF s active_shadow_1",
 "$	c #B0B0B0 s active_mid_2",
 "#	c #C0C0C0 s active_color_2",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####"};
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index 70965c0f6ecd291954924033f91ae635a90a00a3..77c252cadb96b46aa6ab6ae27afad813cf668f42 100644
Binary files a/themes/default/left-inactive.png and b/themes/default/left-inactive.png differ
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index d2b1fcc5d00c9d32248a1270ddaf077238dfea54..b252926388429de7501dcd15b5c7146b7bb04369 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,41 +1,41 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"5 32 6 1",
+"3 32 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0D0 s inactive_hilight_2",
 "@	c #A0A0FF s inactive_shadow_1",
 "$	c #B0B0B0 s inactive_mid_2",
 "#	c #C0C0C0 s inactive_color_2",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####",
-"@####"};
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##",
+"@##"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index cc62381c331a3ad9374e09864f16536e1c2c975a..9a34f65ee5375847b6543b2d710e7886efb31554 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 6c278a47860b4dca892f60d60b99a81f784cda1c..2874a5d6d69ef57181351dc5713a1f8d14744d6c 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 0188d5cd6e7b5823b1a49fe744b31672eb06770b..32e6f62d3eabe2475874f93f3437c350832b9ffb 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index ab2a2c58a225362a0ef39b7e9127f959a8275b4b..10ff628acc342f55fe5734dce320868526c80805 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_toggled_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@.#####.@@@",
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index d46e0f94c2ece76df81f3edc3f3155b6ced2b308..b294c1cae0fe137d296d330fd5b4b610275970e3 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_toggled_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@.#####.@@@",
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 4327ce83e00c31f159e175c4a0053b24d8a89519..3c3acb25bfef7ec3edbf6c4b34da8714f9940cf7 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * maximize_toggled_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/menu-active.png and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 9d4c886b1203ccfe786e8fba31fbe49ba0a91699..70a69143ca2014041d1fa7838476fbdf765410ba 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * menu_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/menu-inactive.png and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index fc52ad9dace7fe89b73644d636961833eefcb40a..7666c24d3090b2029bcc65e02845b068d8bc2806 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * menu_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 603294f12bb4620d3747f5cb0f5ddb7ac4b69bee..78dd788068f38abbfb1d2a2d63717fb2b875aa09 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * menu_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 70965c0f6ecd291954924033f91ae635a90a00a3..77c252cadb96b46aa6ab6ae27afad813cf668f42 100644
Binary files a/themes/default/right-active.png and b/themes/default/right-active.png differ
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index b03388ec2ec6516c7e99ef0b4d44b4cf1a93b9b6..1007e5ea94a231e89fb73b3d2cb77e9c1160d9d5 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,41 +1,41 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"5 32 6 1",
+"3 32 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0D0 s active_hilight_2",
 "@	c #A0A0FF s active_shadow_1",
 "$	c #B0B0B0 s active_mid_2",
 "#	c #C0C0C0 s active_color_2",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@"};
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 70965c0f6ecd291954924033f91ae635a90a00a3..77c252cadb96b46aa6ab6ae27afad813cf668f42 100644
Binary files a/themes/default/right-inactive.png and b/themes/default/right-inactive.png differ
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 170585e2948ca3d871e49c054ecfc0ba2c37000f..959ee76d08c69530cba0fdcfeb68dccb231947ff 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,41 +1,41 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"5 32 6 1",
+"3 32 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0D0 s inactive_hilight_2",
 "@	c #A0A0FF s inactive_shadow_1",
 "$	c #B0B0B0 s inactive_mid_2",
 "#	c #C0C0C0 s inactive_color_2",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@",
-"####@"};
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@",
+"##@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 25575240cfca0f84486b0f00e238944291d1f3e0..a5ed4666bc2146dc19d2549d807d2ae543a0fb8a 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 2f8659ce0868567f4b70763adbd7bc5d986aedb0..b07ca860a81d1d3d0c17e3ef24b9fdaa106baca8 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index bddaa9e731f8191d942479ee488ff22cdba07ae0..19749a87ab5c2c77f35baed29b242bb14c2bbca1 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 073d8b24628646b714b92f118804496e7168f859..2d02ba587cd15c5869b4790f696df996343ca366 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_toggled_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 5dc852b28fb65233487e572d6dbc8f6d9fba7e61..4fe548ab0501e9ee111cfa6a25c862ad6e1fbcdd 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_toggled_inactive_xpm[] = {
 "#	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 46682582378d0d09fb1e9b176b97448d0fd9c8d6..4adffb744de7cdd3929ddf1ed5c90461605ee269 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -8,6 +8,8 @@ static char * shade_toggled_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 8f2be402aea53ea3021ecb4a41fbbaad62c36c20..7433b5cee419a546cb2c747cfbab1212810d756a 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"16 16 6 1",
+"16 18 6 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -9,6 +9,8 @@ static char * stick_active_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 3def7387b8728a8479795f081075ec6dec5acaee..98ef7ce2a3dd51e135c09d50255afb01851ddc8c 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 "+	c #D0D0FF s inactive_hilight_1",
 "@	c #B0B0FF s inactive_mid_1",
@@ -8,6 +8,8 @@ static char * stick_inactive_xpm[] = {
 "$	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index e984f1770dd7dab50b80a9b02830ddfb979bd40f..26e6ddacaf9f957e03ae21612655ff44df74c46c 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"16 16 6 1",
+"16 18 6 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -9,6 +9,8 @@ static char * stick_pressed_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 2ccedd03bb8b38ab24f439d2f0b6766d36057da9..467c65b5aa00aa7995f5be3a2f174dab55c2c3f9 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"16 16 6 1",
+"16 18 6 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -9,6 +9,8 @@ static char * stick_toggled_active_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index b2460b42c445b8bf4d2dc1dd27bd86c30212490d..89633eec40f9dc2d19207a9f8954c204ab148264 100644
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index a9b16af41387fe95d8f3207cbe6d60b1e0c09fbb..e8ff1a9e010a17c43eba1f2f4f54d5cd016e1d08 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"16 16 5 1",
+"16 18 5 1",
 " 	c None",
 "+	c #D0D0FF s inactive_hilight_1",
 "@	c #B0B0FF s inactive_mid_1",
@@ -8,6 +8,8 @@ static char * stick_toggled_inactive_xpm[] = {
 "$	c #D0D0FF s inactive_hilight_1",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 5f2846c588d80c991f0ce18acf5542749029d88d..eca7614bfafabe2fa3d17f71d31512299a1fea31 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index cd6a9f4ab8b8216f1c975ea2574a99dda3610603..714e781123a8a5274ca30660c1f9340425b16c23 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"16 16 6 1",
+"16 18 6 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "+	c #D0D0FF s active_hilight_1",
@@ -9,6 +9,8 @@ static char * stick_toggled_pressed_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
+"                ",
+"                ",
 " @@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
diff --git a/themes/default/themerc b/themes/default/themerc
index 8bdd6d8c0d4c2a4ae290d8d7746d3c9ca66913f2..6df317d918ba820eddc932492837ec4a5db45f05 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,6 +1,6 @@
-button_offset=1
-button_spacing=2
+button_offset=3
+button_spacing=3
 full_width_title=true
-title_horizontal_offset=4
+title_horizontal_offset=3
 title_vertical_offset_active=3
 title_vertical_offset_inactive=3
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index cb4017f39a834d3239e4db5637c2c2900625a627..12d85b58fcc6adfcc9e8e53a48608148021ea5e4 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * title_active_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 56c581ae4d9b2b693756e63397dd1ddb5287d493..a1fd32b9ecfc8b38dc9462c7d1eab4ff26d6be03 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * title_inactive_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index cb4017f39a834d3239e4db5637c2c2900625a627..12d85b58fcc6adfcc9e8e53a48608148021ea5e4 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * title_active_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 56c581ae4d9b2b693756e63397dd1ddb5287d493..a1fd32b9ecfc8b38dc9462c7d1eab4ff26d6be03 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * title_inactive_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index cb4017f39a834d3239e4db5637c2c2900625a627..12d85b58fcc6adfcc9e8e53a48608148021ea5e4 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * title_active_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 56c581ae4d9b2b693756e63397dd1ddb5287d493..a1fd32b9ecfc8b38dc9462c7d1eab4ff26d6be03 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * title_inactive_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index cb4017f39a834d3239e4db5637c2c2900625a627..12d85b58fcc6adfcc9e8e53a48608148021ea5e4 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * title_active_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 56c581ae4d9b2b693756e63397dd1ddb5287d493..a1fd32b9ecfc8b38dc9462c7d1eab4ff26d6be03 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * title_inactive_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index cb4017f39a834d3239e4db5637c2c2900625a627..12d85b58fcc6adfcc9e8e53a48608148021ea5e4 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * title_active_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index 70df6ccedd6870f5336507beddf19b74f0033c68..5522f3723e8cd846ee2816306933b52fcf98d7a3 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 56c581ae4d9b2b693756e63397dd1ddb5287d493..a1fd32b9ecfc8b38dc9462c7d1eab4ff26d6be03 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"2 24 6 1",
+"2 23 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * title_inactive_xpm[] = {
 "##",
 "##",
 "##",
-"##",
 "##"};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 92b3eaa4cdf6adf9cb62ad34719cd4cf23671e48..85d8e518c8d76ff7096715aa5c41251bc7587494 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index dbe8206400543c28e4ab63db9b813762a0ff4794..bf82fb4be27c0b3b27cfdb6768e3b6bb67825055 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 24 6 1",
+"8 23 6 1",
 "       c None",
 ".      c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * top_left_active_xpm[] = {
 "@$$$$$$$",
 "@$$$$$$$",
 "@$$$$$$$",
-"@$$$$$$$",
 "@$$$$$$$"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 92b3eaa4cdf6adf9cb62ad34719cd4cf23671e48..85d8e518c8d76ff7096715aa5c41251bc7587494 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index f32b48a2267d2e6ee108111c99888779d410ae15..2931ae8bf2f5989d54716da258cd3d0c707dfc23 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 24 6 1",
+"8 23 6 1",
 "       c None",
 ".      c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * top_left_inactive_xpm[] = {
 "@$$$$$$$",
 "@$$$$$$$",
 "@$$$$$$$",
-"@$$$$$$$",
 "@$$$$$$$"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 40c2f2bd1a4baaa65a69c7ad3045ade729b5bef9..1507b62bdc764a17ea5e1d10d28076cedcb717ea 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index d8b0bbaa66b7f6743037d8a7d64c2ccefbf8b3f6..5c921e635eec56829a136043a68acf0d84a4de3c 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 24 6 1",
+"8 23 6 1",
 "       c None",
 ".      c #000000",
 "+	c #D0D0FF s active_hilight_1",
@@ -29,5 +29,4 @@ static char * top_right_active_xpm[] = {
 "$$$$$$$@",
 "$$$$$$$@",
 "$$$$$$$@",
-"$$$$$$$@",
 "$$$$$$$@"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index 40c2f2bd1a4baaa65a69c7ad3045ade729b5bef9..1507b62bdc764a17ea5e1d10d28076cedcb717ea 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 21e0d0b9f50bd9a21a08e4ac66e545b8285a5d36..165499c377eaca8996b1d58f9fc1e3173c2eea38 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 24 6 1",
+"8 23 6 1",
 "       c None",
 ".      c #000000",
 "+	c #D0D0FF s inactive_hilight_1",
@@ -29,5 +29,4 @@ static char * top_right_inactive_xpm[] = {
 "$$$$$$$@",
 "$$$$$$$@",
 "$$$$$$$@",
-"$$$$$$$@",
 "$$$$$$$@"};