Theme stuff

(Old svn revision: 11430)

42 files changed, 79 insertions, 161 deletions

diff --git a/themes/default-4.0/close-active.xpm b/themes/default-4.0/close-active.xpm
index d6187796d..e95d96851 100644
--- a/themes/default-4.0/close-active.xpm
+++ b/themes/default-4.0/close-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * close_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * close_active_xpm[] = {
 "+++++##@$+$@##+++++",
 "+++++@@$+++$@@+++++",
 "+++++$$+++++$$+++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/close-inactive.xpm b/themes/default-4.0/close-inactive.xpm
index 94dd4496e..23122a76e 100644
--- a/themes/default-4.0/close-inactive.xpm
+++ b/themes/default-4.0/close-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * close_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * close_inactive_xpm[] = {
 "+++++@@$+++$@@+++++",
 "+++++$$+++++$$+++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/close-pressed.xpm b/themes/default-4.0/close-pressed.xpm
index 3daadfeaa..70f5fb588 100644
--- a/themes/default-4.0/close-pressed.xpm
+++ b/themes/default-4.0/close-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * close_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * close_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/hide-active.xpm b/themes/default-4.0/hide-active.xpm
index f3f55d006..96113f589 100644
--- a/themes/default-4.0/hide-active.xpm
+++ b/themes/default-4.0/hide-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * hide_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * hide_active_xpm[] = {
 "+++++++$$$$$+++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/hide-inactive.xpm b/themes/default-4.0/hide-inactive.xpm
index 15d283458..b08dce0b9 100644
--- a/themes/default-4.0/hide-inactive.xpm
+++ b/themes/default-4.0/hide-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * hide_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * hide_inactive_xpm[] = {
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/hide-pressed.xpm b/themes/default-4.0/hide-pressed.xpm
index 2e0e2e81c..e03849fad 100644
--- a/themes/default-4.0/hide-pressed.xpm
+++ b/themes/default-4.0/hide-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * hide_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * hide_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-active.xpm b/themes/default-4.0/maximize-active.xpm
index a26479be9..13e4a4bd8 100644
--- a/themes/default-4.0/maximize-active.xpm
+++ b/themes/default-4.0/maximize-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * maximize_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * maximize_active_xpm[] = {
 "+++++#########+++++",
 "+++++@@@@@@@@@+++++",
 "+++++$$$$$$$$$+++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-inactive.xpm b/themes/default-4.0/maximize-inactive.xpm
index 93bd6d8c2..90ff828d4 100644
--- a/themes/default-4.0/maximize-inactive.xpm
+++ b/themes/default-4.0/maximize-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * maximize_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * maximize_inactive_xpm[] = {
 "+++++@@@@@@@@@+++++",
 "+++++$$$$$$$$$+++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-pressed.xpm b/themes/default-4.0/maximize-pressed.xpm
index 373c0ab0b..6bcc67070 100644
--- a/themes/default-4.0/maximize-pressed.xpm
+++ b/themes/default-4.0/maximize-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * maximize_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * maximize_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-toggled-active.xpm b/themes/default-4.0/maximize-toggled-active.xpm
index 99ffad61c..2b3089ba0 100644
--- a/themes/default-4.0/maximize-toggled-active.xpm
+++ b/themes/default-4.0/maximize-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * maximize_toggled_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "++++########+++++++",
@@ -24,8 +23,7 @@ static char * maximize_toggled_active_xpm[] = {
 "++++$$$########++++",
 "+++++++########++++",
 "+++++++@@@@@@@@++++",
-"+++++++$$$$$$$$++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-toggled-inactive.xpm b/themes/default-4.0/maximize-toggled-inactive.xpm
index 28b3998d7..36ffe4520 100644
--- a/themes/default-4.0/maximize-toggled-inactive.xpm
+++ b/themes/default-4.0/maximize-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "++++@@@@@@@@+++++++",
@@ -24,8 +23,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 "+++++++@@@@@@@@++++",
 "+++++++@@@@@@@@++++",
 "+++++++$$$$$$$$++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/maximize-toggled-pressed.xpm b/themes/default-4.0/maximize-toggled-pressed.xpm
index 121d2615c..e536e7690 100644
--- a/themes/default-4.0/maximize-toggled-pressed.xpm
+++ b/themes/default-4.0/maximize-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * maximize_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * maximize_toggled_pressed_xpm[] = {
 ".@@@@@@........@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/menu-active.xpm b/themes/default-4.0/menu-active.xpm
index 8071907a8..7e2080fc9 100644
--- a/themes/default-4.0/menu-active.xpm
+++ b/themes/default-4.0/menu-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * menu_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * menu_active_xpm[] = {
 "+++++++$@#@$+++++++",
 "++++++++$@$++++++++",
 "+++++++++$+++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/menu-inactive.xpm b/themes/default-4.0/menu-inactive.xpm
index 5f2648605..d4164a504 100644
--- a/themes/default-4.0/menu-inactive.xpm
+++ b/themes/default-4.0/menu-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * menu_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * menu_inactive_xpm[] = {
 "++++++++$@$++++++++",
 "+++++++++$+++++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/menu-pressed.xpm b/themes/default-4.0/menu-pressed.xpm
index e0f84e1a8..33b29f21c 100644
--- a/themes/default-4.0/menu-pressed.xpm
+++ b/themes/default-4.0/menu-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * menu_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,5 +25,4 @@ static char * menu_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
diff --git a/themes/default-4.0/shade-active.xpm b/themes/default-4.0/shade-active.xpm
index b1e4255ae..79ceb280a 100644
--- a/themes/default-4.0/shade-active.xpm
+++ b/themes/default-4.0/shade-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * shade_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * shade_active_xpm[] = {
 "++++$$$$$$$$$$$++++",
 "++++@@@@@@@@@@@++++",
 "++++###########++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/shade-inactive.xpm b/themes/default-4.0/shade-inactive.xpm
index bdaf39dd8..9992a724f 100644
--- a/themes/default-4.0/shade-inactive.xpm
+++ b/themes/default-4.0/shade-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * shade_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * shade_inactive_xpm[] = {
 "++++@@@@@@@@@@@++++",
 "++++###########++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/shade-pressed.xpm b/themes/default-4.0/shade-pressed.xpm
index 949fafe16..cf073b6e0 100644
--- a/themes/default-4.0/shade-pressed.xpm
+++ b/themes/default-4.0/shade-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * shade_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * shade_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/shade-toggled-active.xpm b/themes/default-4.0/shade-toggled-active.xpm
index 534b7b975..511f95923 100644
--- a/themes/default-4.0/shade-toggled-active.xpm
+++ b/themes/default-4.0/shade-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * shade_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * shade_toggled_active_xpm[] = {
 "++++$$$$$$$$$$$++++",
 "++++@@@@@@@@@@@++++",
 "++++###########++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/shade-toggled-inactive.xpm b/themes/default-4.0/shade-toggled-inactive.xpm
index 3c6fc9452..0109837b4 100644
--- a/themes/default-4.0/shade-toggled-inactive.xpm
+++ b/themes/default-4.0/shade-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * shade_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * shade_toggled_inactive_xpm[] = {
 "++++@@@@@@@@@@@++++",
 "++++###########++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/shade-toggled-pressed.xpm b/themes/default-4.0/shade-toggled-pressed.xpm
index b58ea2c78..7e6ce6df4 100644
--- a/themes/default-4.0/shade-toggled-pressed.xpm
+++ b/themes/default-4.0/shade-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * shade_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * shade_toggled_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/stick-active.xpm b/themes/default-4.0/stick-active.xpm
index 81283bdf7..a2eb2dfd8 100644
--- a/themes/default-4.0/stick-active.xpm
+++ b/themes/default-4.0/stick-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * stick_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * stick_active_xpm[] = {
 "++++++++++@$$$@++++",
 "++++++++++$+++$++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/stick-inactive.xpm b/themes/default-4.0/stick-inactive.xpm
index 989ede021..b3d2eda76 100644
--- a/themes/default-4.0/stick-inactive.xpm
+++ b/themes/default-4.0/stick-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * stick_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * stick_inactive_xpm[] = {
 "++++++++++$+++$++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "$$$$$$$$$$$$$$$$$$$",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/stick-pressed.xpm b/themes/default-4.0/stick-pressed.xpm
index d8c2bab3b..e349af694 100644
--- a/themes/default-4.0/stick-pressed.xpm
+++ b/themes/default-4.0/stick-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,7 +8,6 @@ static char * stick_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................+",
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
@@ -26,6 +25,5 @@ static char * stick_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@@@=",
 "+==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/stick-toggled-active.xpm b/themes/default-4.0/stick-toggled-active.xpm
index 78d446f90..8f6af81f3 100644
--- a/themes/default-4.0/stick-toggled-active.xpm
+++ b/themes/default-4.0/stick-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,8 +8,7 @@ static char * stick_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * stick_toggled_active_xpm[] = {
 "++++++++#@@@##+++++",
 "++++++++++###++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/stick-toggled-inactive.xpm b/themes/default-4.0/stick-toggled-inactive.xpm
index 66ef20f5d..b5a30c5ab 100644
--- a/themes/default-4.0/stick-toggled-inactive.xpm
+++ b/themes/default-4.0/stick-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,8 +8,7 @@ static char * stick_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                   ",
-"                   ",
-"+++++++++++++++++++",
+"...................",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
 "+++++++++++++++++++",
@@ -24,8 +23,7 @@ static char * stick_toggled_inactive_xpm[] = {
 "++++++++######+++++",
 "++++++++++###++++++",
 "+++++++++++++++++++",
-"+++++++++++++++++++",
 "###################",
-"                   ",
+"@@@@@@@@@@@@@@@@@@@",
 "                   "};
 
diff --git a/themes/default-4.0/stick-toggled-pressed.xpm b/themes/default-4.0/stick-toggled-pressed.xpm
index 6668e04c7..2b460525c 100644
--- a/themes/default-4.0/stick-toggled-pressed.xpm
+++ b/themes/default-4.0/stick-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"19 21 6 1",
+"19 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #B4BAB4 s active_mid_2",
@@ -8,7 +8,6 @@ static char * stick_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                   ",
-"                   ",
 "..................@",
 ".+++++++++++++++++=",
 ".+++++++++++++++++=",
@@ -26,6 +25,5 @@ static char * stick_toggled_pressed_xpm[] = {
 ".+++++++++++++++++=",
 ".+++++++++++++++++=",
 "@==================",
-"                   ",
 "                   "};
 
diff --git a/themes/default-4.0/themerc b/themes/default-4.0/themerc
index 9143ba271..4bf71d449 100644
--- a/themes/default-4.0/themerc
+++ b/themes/default-4.0/themerc
@@ -2,7 +2,7 @@ button_offset=0
 button_spacing=0
 full_width_title=true
 title_horizontal_offset=0
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=0
+title_vertical_offset_inactive=0
 title_shadow_active=false
 title_shadow_inactive=false
diff --git a/themes/default-4.0/title-1-active.xpm b/themes/default-4.0/title-1-active.xpm
index fd2683679..bbf592a61 100644
--- a/themes/default-4.0/title-1-active.xpm
+++ b/themes/default-4.0/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"8 21 6 1",
+"8 19 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_1_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########",
 "........",
 "$$$$$$$$"};
diff --git a/themes/default-4.0/title-1-inactive.xpm b/themes/default-4.0/title-1-inactive.xpm
index 5437461e4..0c755cba0 100644
--- a/themes/default-4.0/title-1-inactive.xpm
+++ b/themes/default-4.0/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"8 21 6 1",
+"8 19 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_1_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########",
 "........",
 "$$$$$$$$"};
diff --git a/themes/default-4.0/title-2-active.xpm b/themes/default-4.0/title-2-active.xpm
index 660b461e4..d4178eef0 100644
--- a/themes/default-4.0/title-2-active.xpm
+++ b/themes/default-4.0/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_active_xpm[] = {
-"16 21 10 1",
+"16 19 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_2_active_xpm[] = {
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
 "@@@@@&$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@&$$$$$$$$$",
diff --git a/themes/default-4.0/title-2-inactive.xpm b/themes/default-4.0/title-2-inactive.xpm
index 48763bc44..01f3e2fb2 100644
--- a/themes/default-4.0/title-2-inactive.xpm
+++ b/themes/default-4.0/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_inactive_xpm[] = {
-"16 21 10 1",
+"16 19 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_2_inactive_xpm[] = {
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
 "@@@@@&$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@&$$$$$$$$$",
diff --git a/themes/default-4.0/title-3-active.xpm b/themes/default-4.0/title-3-active.xpm
index a2f53ea8e..a50a2174b 100644
--- a/themes/default-4.0/title-3-active.xpm
+++ b/themes/default-4.0/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_active_xpm[] = {
-"20 21 10 1",
+"20 19 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -27,8 +27,6 @@ static char * title_3_active_xpm[] = {
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
 "$$$$$$$$$$$$$$$$$$$$",
 "####################",
 "...................."};
diff --git a/themes/default-4.0/title-3-inactive.xpm b/themes/default-4.0/title-3-inactive.xpm
index 1cb2c30ea..94f486f46 100644
--- a/themes/default-4.0/title-3-inactive.xpm
+++ b/themes/default-4.0/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_inactive_xpm[] = {
-"20 21 10 1",
+"20 19 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -27,8 +27,6 @@ static char * title_3_inactive_xpm[] = {
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
 "$$$$$$$$$$$$$$$$$$$$",
 "####################",
 "...................."};
diff --git a/themes/default-4.0/title-4-active.xpm b/themes/default-4.0/title-4-active.xpm
index 0d96b26e5..47dcde8df 100644
--- a/themes/default-4.0/title-4-active.xpm
+++ b/themes/default-4.0/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_active_xpm[] = {
-"16 21 10 1",
+"16 19 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_4_active_xpm[] = {
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&*@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&*@@@@@@",
diff --git a/themes/default-4.0/title-4-inactive.xpm b/themes/default-4.0/title-4-inactive.xpm
index 5b0f5b6ca..dc133b240 100644
--- a/themes/default-4.0/title-4-inactive.xpm
+++ b/themes/default-4.0/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_inactive_xpm[] = {
-"16 21 10 1",
+"16 19 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_4_inactive_xpm[] = {
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&*@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&*@@@@@@",
diff --git a/themes/default-4.0/title-5-active.xpm b/themes/default-4.0/title-5-active.xpm
index 64caaff75..527bde6ce 100644
--- a/themes/default-4.0/title-5-active.xpm
+++ b/themes/default-4.0/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_active_xpm[] = {
-"8 21 6 1",
+"8 19 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_5_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########",
 "........",
 "$$$$$$$$"};
diff --git a/themes/default-4.0/title-5-inactive.xpm b/themes/default-4.0/title-5-inactive.xpm
index 1c394d418..0da189c85 100644
--- a/themes/default-4.0/title-5-inactive.xpm
+++ b/themes/default-4.0/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_inactive_xpm[] = {
-"8 21 6 1",
+"8 19 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_5_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########",
 "........",
 "$$$$$$$$"};
diff --git a/themes/default-4.0/top-left-active.xpm b/themes/default-4.0/top-left-active.xpm
index 87f547ae4..29720ba18 100644
--- a/themes/default-4.0/top-left-active.xpm
+++ b/themes/default-4.0/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"7 21 6 1",
+"7 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * top_left_active_xpm[] = {
 "$.@####",
 "$.@####",
 "$.@####",
-"$.@####",
-"$.@####",
 "$.@#@@@",
 "$.@#@..",
 "$.@#@.$"};
diff --git a/themes/default-4.0/top-left-inactive.xpm b/themes/default-4.0/top-left-inactive.xpm
index 3676be328..8714f016c 100644
--- a/themes/default-4.0/top-left-inactive.xpm
+++ b/themes/default-4.0/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"7 21 6 1",
+"7 19 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * top_left_inactive_xpm[] = {
 "$.@####",
 "$.@####",
 "$.@####",
-"$.@####",
-"$.@####",
 "$.@#@@@",
 "$.@#@..",
 "$.@#@.$"};
diff --git a/themes/default-4.0/top-right-active.xpm b/themes/default-4.0/top-right-active.xpm
index 4c44bb969..5770c75d6 100644
--- a/themes/default-4.0/top-right-active.xpm
+++ b/themes/default-4.0/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"7 21 6 1",
+"7 19 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * top_right_active_xpm[] = {
 "####@.$",
 "####@.$",
 "####@.$",
-"####@.$",
-"####@.$",
 "@@@#@.$",
 "..@#@.$",
 "$.@#@.$"};
diff --git a/themes/default-4.0/top-right-inactive.xpm b/themes/default-4.0/top-right-inactive.xpm
index 9be9225bf..502826754 100644
--- a/themes/default-4.0/top-right-inactive.xpm
+++ b/themes/default-4.0/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"7 21 6 1",
+"7 19 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * top_right_inactive_xpm[] = {
 "####@.$",
 "####@.$",
 "####@.$",
-"####@.$",
-"####@.$",
 "@@@#@.$",
 "..@#@.$",
 "$.@#@.$"};