diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index d3b1aee79f76568f2ee1b2662fdf99580537cba6..f7a1d447926203311b12b6e1144efd168e18a0d3 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * close_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * close_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 18b1cc562822bf4b01cb8ec9f5aec4d229d04035..315824440a9ae468e2e7906cead38a24c28eeecf 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * close_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * close_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index a3dcd61117729de19ebca4b2f87b7280ff5031a3..f20d9b82fd323c649937eed8b26f90eb2e124da9 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * close_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * close_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 0bbe47c312baa74aa6ece076c0a68ac993912226..ca2e65ad34af3b37d030ee94f9c8b38356e23d37 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * hide_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * hide_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 96fc067549263a4320a1bd9a0e35d6c6183f5a23..e3c7e29c8fcc9c329aaa53b665b81bf6e322d592 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * hide_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * hide_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 38ab6b9a485d8a15700b40030f32102235d5614b..a116b50c906507b7daa175ed04e42a215a699642 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * hide_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * hide_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index aeece93e622f868fd0bd2accc8bd887ecf07dcf5..c0713f951ae099c64365fea61d0057c50874a31e 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * maximize_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * maximize_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index a592845385740372a0eea5230df4fc56bf09b4c9..37abe73ef8f78f1a1d47d2e3246bad45d5d16598 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * maximize_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * maximize_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 3aca5783f9273431a83f84c75a90cc1de6cae627..a8104a07394fd4c34c793627c557078968437415 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * maximize_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * maximize_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index e1a0dcd3b1b9750dbbc035d5d7a7e5f287f870c8..6a56448c35912ad3a39d679251008537c34eca10 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[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * maximize_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * maximize_toggled_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 61d566aaec6cd000b805abc7e93fc68b56db28f1..0bed3172b75deaf6bce72d980d28a23a8370c108 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[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * maximize_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * maximize_toggled_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index de0e939334a1db1dcb841ffe6fcaf35e2e7957fa..5d0ec6009fb39ee4c7465e80db126fd952fc5752 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[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * maximize_toggled_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * maximize_toggled_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index bb66ed3de9e8c22bf50a39fc42cac2fff38c1cf1..192017ea1cee05e4ac64f885c9df4683634375d5 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * menu_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * menu_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index f42a99163f7592a4faa7f29931855ce2d3ea6165..6e4be7fc342ec7a6e47980d7d05da2c15ee9f223 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * menu_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * menu_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 3468b9a5c5f0c63c0e2a771547f7782741ae834c..1933fcd73d9b07b55e603c9ab208fcdd058a62a3 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * menu_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * menu_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 085973dd30e2dcac250b127d105af00ad234c01a..ffea0d122a4e413a6c7440070b9c6d6ba56285ff 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * shade_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * shade_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index f2670e031c1e123b86ee5a2c90752950ae6f5262..78c463fedbbc12ff971f1780b387ecc36a64da62 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * shade_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * shade_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index b6d65d5a11430a303236bf88d06428990c88fe71..167ac92a48cc7171091bc39664f284d16a4f76f5 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * shade_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * shade_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 0d806d0e8f06da6b11336957cbe84f3b0bc3fa41..23126f05a58733f0714a758cd8786d58ce697eae 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[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -11,7 +11,6 @@ static char * shade_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * shade_toggled_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index bb1c6277be400bdd24bae7fbdd80feeb51199956..40d734a28fe8bbdecdce538ea6ee8dd964b3e301 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[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * shade_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * shade_toggled_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 0ec7ee4e6df7820a11d7bec41b4db524039dbad9..c212062d9ea8842a0aa25e1718f24dd5df014f50 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[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * shade_toggled_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * shade_toggled_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 3e0dcdd1cefe1e7309d656041207a90772fb6f26..6759c48931f8a35f927d01005a6750524f92deb6 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 24 7 1",
+"18 22 7 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -12,7 +12,6 @@ static char * stick_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -30,5 +29,4 @@ static char * stick_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 944ba6f34ef63e24b647b45f345eaa30a69e1102..51b94bd125809ed972c3421221dc964434b43c23 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * stick_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * stick_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 1fff3613dc95d3f4e212a0239c38fd501a5974b8..881924ba132b63945294efbd313353609d807298 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * stick_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * stick_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index b279327921cceacb272503896a39132381e57057..bd2bc5a7751efdf203cb2199514f0f416b688003 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[] = {
-"18 24 7 1",
+"18 22 7 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_2",,
@@ -12,7 +12,6 @@ static char * stick_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -30,5 +29,4 @@ static char * stick_toggled_active_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 9a341d3f9409aee329e4c44a339f0c3e3d87e9cc..37e4059215cc3ef8cf91d17ddb2524ed2e7aaf67 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[] = {
-"18 24 6 1",
+"18 22 6 1",
 " 	c None",
 ".	c #4B58A2 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,6 @@ static char * stick_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@#.",
@@ -29,5 +28,4 @@ static char * stick_toggled_inactive_xpm[] = {
 " .##############. ",
 "  ..............  ",
 "                  ",
-"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 1c90258a3c8045da162be60bf7c3a1d580d3f9ce..a45153d6c6f5ba6eee51708bdfe0c8b22573166d 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[] = {
-"18 24 4 1",
+"18 22 4 1",
 " 	c None",
 ".	c #4B58A2 s active_shadow_1",
 "+	c #949595 s active_shadow_2",
@@ -9,7 +9,6 @@ static char * stick_toggled_pressed_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 "  ..............  ",
 " .++++++++++++++. ",
 ".++++++++++++++++.",
@@ -27,5 +26,4 @@ static char * stick_toggled_pressed_xpm[] = {
 " .++++++++++++++. ",
 "  ..............  ",
 "                  ",
-"  ..............  ",
 "                  "};
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 30eef9135a10852ee8838f555e8a7cb9aac272e4..5fd36c68bbe7d76988f43426172da8f29ec7f3f2 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_1",
@@ -28,6 +28,4 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index a171030c9c3e3af53771da17a8f0557218b4728c..d66f243a1e89239c4d4d6b6fcaf2d7a72442721d 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_1",
@@ -28,6 +28,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 30eef9135a10852ee8838f555e8a7cb9aac272e4..5fd36c68bbe7d76988f43426172da8f29ec7f3f2 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_1",
@@ -28,6 +28,4 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index a171030c9c3e3af53771da17a8f0557218b4728c..d66f243a1e89239c4d4d6b6fcaf2d7a72442721d 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_1",
@@ -28,6 +28,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 30eef9135a10852ee8838f555e8a7cb9aac272e4..5fd36c68bbe7d76988f43426172da8f29ec7f3f2 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_1",
@@ -28,6 +28,4 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index a171030c9c3e3af53771da17a8f0557218b4728c..d66f243a1e89239c4d4d6b6fcaf2d7a72442721d 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_1",
@@ -28,6 +28,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 30eef9135a10852ee8838f555e8a7cb9aac272e4..5fd36c68bbe7d76988f43426172da8f29ec7f3f2 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_1",
@@ -28,6 +28,4 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index a171030c9c3e3af53771da17a8f0557218b4728c..d66f243a1e89239c4d4d6b6fcaf2d7a72442721d 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_1",
@@ -28,6 +28,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 30eef9135a10852ee8838f555e8a7cb9aac272e4..5fd36c68bbe7d76988f43426172da8f29ec7f3f2 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_1",
 "+	c #FFFFFF s active_hilight_1",
@@ -28,6 +28,4 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index a171030c9c3e3af53771da17a8f0557218b4728c..d66f243a1e89239c4d4d6b6fcaf2d7a72442721d 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[] = {
-"8 24 6 1",
+"8 22 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_1",
 "+	c #FFFFFF s inactive_hilight_1",
@@ -28,6 +28,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index e36fb83455d49ff73c8b9341ec8d325284e97d5d..ebc14a82a6f4a752f210025a5bd36caa7404fc0a 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[] = {
-"7 24 6 1",
+"7 22 6 1",
 "       c None",
 ".      c #949594 s active_shadow_1",
 "+      c #FFFFFF s active_hilight_1",
@@ -9,7 +9,7 @@ static char * top_left_active_xpm[] = {
 "$      c #000000",
 "    $$$",
 "  $$$$$",
-" $$$@++",
+" $$$.++",
 " $$@+##",
 "$$.####",
 "$$@####",
@@ -28,6 +28,4 @@ static char * top_left_active_xpm[] = {
 "$$#####",
 "$$#####",
 "$$#####",
-"$$#####",
-"$$#####",
 "$$#####"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 53dd71387c536e139ba3b795ce3a61c172d550cd..c52a47daf291a443a4b09e3a0d1c62a8ef55bbc1 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[] = {
-"7 24 6 1",
+"7 22 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_1",
 "+      c #FFFFFF s inactive_hilight_1",
@@ -9,7 +9,7 @@ static char * top_left_inactive_xpm[] = {
 "$      c #000000",
 "    $$$",
 "  $$$$$",
-" $$$@++",
+" $$$.++",
 " $$@+##",
 "$$.####",
 "$$@####",
@@ -28,6 +28,4 @@ static char * top_left_inactive_xpm[] = {
 "$$#####",
 "$$#####",
 "$$#####",
-"$$#####",
-"$$#####",
 "$$#####"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 5a0542f3942f0272407a895247fbc47221d73397..6dbc4b4a9b8a81be9f375f16047e5c38d9381ffa 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[] = {
-"7 24 6 1",
+"7 22 6 1",
 "       c None",
 ".      c #949594 s active_shadow_1",
 "+      c #FFFFFF s active_hilight_1",
@@ -9,7 +9,7 @@ static char * top_right_active_xpm[] = {
 "$      c #000000",
 "$$$    ",
 "$$$$$  ",
-"++@$$$ ",
+"++.$$$ ",
 "##+@$$ ",
 "####.$$",
 "####@$$",
@@ -28,6 +28,4 @@ static char * top_right_active_xpm[] = {
 "#####$$",
 "#####$$",
 "#####$$",
-"#####$$",
-"#####$$",
 "#####$$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 7195d57a8c9e0202413652bb403aaba078e4aae1..82a87fd00756c03eded6e2c95b81566fe13d395c 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[] = {
-"7 24 6 1",
+"7 22 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_1",
 "+      c #FFFFFF s inactive_hilight_1",
@@ -9,7 +9,7 @@ static char * top_right_inactive_xpm[] = {
 "$      c #000000",
 "$$$    ",
 "$$$$$  ",
-"++@$$$ ",
+"++.$$$ ",
 "##+@$$ ",
 "####.$$",
 "####@$$",
@@ -28,6 +28,4 @@ static char * top_right_inactive_xpm[] = {
 "#####$$",
 "#####$$",
 "#####$$",
-"#####$$",
-"#####$$",
 "#####$$"};