From 6ace5acbbca63738c4c56457feb6dd4a15e141a9 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sun, 23 Nov 2003 21:56:08 +0000
Subject: [PATCH] Themes Flush X after setting focus explicitely

(Old svn revision: 11451)
---
 src/client.c                                  |  2 +
 themes/default-4.0/bottom-left-active.xpm     | 36 +++++------
 themes/default-4.0/bottom-left-inactive.xpm   | 36 +++++------
 themes/default-4.0/bottom-right-active.xpm    | 30 ++++-----
 themes/default-4.0/bottom-right-inactive.xpm  | 30 ++++-----
 themes/default-4.0/close-active.xpm           |  6 +-
 themes/default-4.0/close-inactive.xpm         |  6 +-
 themes/default-4.0/close-pressed.xpm          |  6 +-
 themes/default-4.0/hide-active.xpm            |  6 +-
 themes/default-4.0/hide-inactive.xpm          |  6 +-
 themes/default-4.0/hide-pressed.xpm           |  6 +-
 themes/default-4.0/left-active.xpm            | 64 +++++++++----------
 themes/default-4.0/left-inactive.xpm          | 64 +++++++++----------
 themes/default-4.0/maximize-active.xpm        |  6 +-
 themes/default-4.0/maximize-inactive.xpm      |  6 +-
 themes/default-4.0/maximize-pressed.xpm       |  6 +-
 .../default-4.0/maximize-toggled-active.xpm   |  6 +-
 .../default-4.0/maximize-toggled-inactive.xpm |  6 +-
 .../default-4.0/maximize-toggled-pressed.xpm  |  6 +-
 themes/default-4.0/menu-active.xpm            |  6 +-
 themes/default-4.0/menu-inactive.xpm          |  6 +-
 themes/default-4.0/menu-pressed.xpm           |  6 +-
 themes/default-4.0/shade-active.xpm           |  6 +-
 themes/default-4.0/shade-inactive.xpm         |  6 +-
 themes/default-4.0/shade-pressed.xpm          |  6 +-
 themes/default-4.0/shade-toggled-active.xpm   |  6 +-
 themes/default-4.0/shade-toggled-inactive.xpm |  6 +-
 themes/default-4.0/shade-toggled-pressed.xpm  |  6 +-
 themes/default-4.0/stick-active.xpm           |  6 +-
 themes/default-4.0/stick-inactive.xpm         |  6 +-
 themes/default-4.0/stick-pressed.xpm          |  6 +-
 themes/default-4.0/stick-toggled-active.xpm   |  6 +-
 themes/default-4.0/stick-toggled-inactive.xpm |  6 +-
 themes/default-4.0/stick-toggled-pressed.xpm  |  6 +-
 themes/default-4.0/themerc                    |  4 +-
 themes/default-4.0/title-1-active.xpm         |  6 +-
 themes/default-4.0/title-1-inactive.xpm       |  6 +-
 themes/default-4.0/title-2-active.xpm         | 38 +++++------
 themes/default-4.0/title-2-inactive.xpm       | 38 +++++------
 themes/default-4.0/title-3-active.xpm         |  6 +-
 themes/default-4.0/title-3-inactive.xpm       |  6 +-
 themes/default-4.0/title-4-active.xpm         | 38 +++++------
 themes/default-4.0/title-4-inactive.xpm       | 38 +++++------
 themes/default-4.0/title-5-active.xpm         |  6 +-
 themes/default-4.0/title-5-inactive.xpm       |  6 +-
 themes/default-4.0/top-left-active.xpm        | 40 ++++++------
 themes/default-4.0/top-left-inactive.xpm      | 40 ++++++------
 themes/default-4.0/top-right-active.xpm       | 15 +++--
 themes/default-4.0/top-right-inactive.xpm     | 16 +++--
 themes/default/close-active.xpm               |  6 +-
 themes/default/close-inactive.xpm             |  6 +-
 themes/default/close-pressed.xpm              |  6 +-
 themes/default/hide-active.xpm                |  6 +-
 themes/default/hide-inactive.xpm              |  6 +-
 themes/default/hide-pressed.xpm               |  6 +-
 themes/default/maximize-active.xpm            |  6 +-
 themes/default/maximize-inactive.xpm          |  6 +-
 themes/default/maximize-pressed.xpm           |  6 +-
 themes/default/maximize-toggled-active.xpm    |  6 +-
 themes/default/maximize-toggled-inactive.xpm  |  6 +-
 themes/default/maximize-toggled-pressed.xpm   |  6 +-
 themes/default/menu-active.xpm                |  6 +-
 themes/default/menu-inactive.xpm              |  6 +-
 themes/default/menu-pressed.xpm               |  6 +-
 themes/default/shade-active.xpm               |  6 +-
 themes/default/shade-inactive.xpm             |  6 +-
 themes/default/shade-pressed.xpm              |  6 +-
 themes/default/shade-toggled-active.xpm       |  6 +-
 themes/default/shade-toggled-inactive.xpm     |  6 +-
 themes/default/shade-toggled-pressed.xpm      |  6 +-
 themes/default/stick-active.xpm               |  6 +-
 themes/default/stick-inactive.xpm             |  6 +-
 themes/default/stick-pressed.xpm              |  6 +-
 themes/default/stick-toggled-active.xpm       |  6 +-
 themes/default/stick-toggled-inactive.xpm     |  6 +-
 themes/default/stick-toggled-pressed.xpm      |  6 +-
 themes/default/title-1-active.xpm             |  6 +-
 themes/default/title-1-inactive.xpm           |  6 +-
 themes/default/title-2-active.xpm             |  6 +-
 themes/default/title-2-inactive.xpm           |  6 +-
 themes/default/title-3-active.xpm             |  6 +-
 themes/default/title-3-inactive.xpm           |  6 +-
 themes/default/title-4-active.xpm             |  6 +-
 themes/default/title-4-inactive.xpm           |  6 +-
 themes/default/title-5-active.xpm             |  6 +-
 themes/default/title-5-inactive.xpm           |  6 +-
 themes/default/top-left-active.xpm            |  6 +-
 themes/default/top-left-inactive.xpm          |  6 +-
 themes/default/top-right-active.xpm           |  5 +-
 themes/default/top-right-inactive.xpm         |  6 +-
 90 files changed, 568 insertions(+), 404 deletions(-)

diff --git a/src/client.c b/src/client.c
index 9b8856857..5d4c9b3b5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -4707,6 +4707,7 @@ clientSetFocus (Client * c, gboolean sort, gboolean ignore_modal)
             clientSortRing(c);
         }
         XSetInputFocus (dpy, c->window, RevertToNone, CurrentTime);
+        XFlush (dpy);
         if ((c->legacy_fullscreen) || CLIENT_FLAG_TEST(c, CLIENT_FLAG_FULLSCREEN))
         {
             clientSetLayer (c, WIN_LAYER_ABOVE_DOCK);
@@ -4719,6 +4720,7 @@ clientSetFocus (Client * c, gboolean sort, gboolean ignore_modal)
         TRACE ("setting focus to none");
         client_focus = NULL;
         XSetInputFocus (dpy, gnome_win, RevertToNone, CurrentTime);
+        XFlush (dpy);
         data[0] = None;
     }
     if (c2)
diff --git a/themes/default-4.0/bottom-left-active.xpm b/themes/default-4.0/bottom-left-active.xpm
index 6bc3b9895..3616fb67b 100644
--- a/themes/default-4.0/bottom-left-active.xpm
+++ b/themes/default-4.0/bottom-left-active.xpm
@@ -2,24 +2,24 @@
 static char * bottom_left_active_xpm[] = {
 "16 16 6 1",
 "       c None",
-".      c #4B58A2 s active_shadow_1",
+".      c #000000",
 "+      c #525FAB s active_color_1",
+"@      c #4B58A2 s active_shadow_1",
 "#      c #FFFFFF s active_hilight_1",
 "$      c #848FD6 s active_mid_1",
-"@      c #000000",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++++++++++++",
-" @.$++++++++++++",
-" @.$$+++++++++++",
-"  @..$$$$$$$$$$$",
-"   @@...........",
-"     @@@@@@@@@@@"};
+".+@@@@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#++++@@@@@@@@@@",
+" .#++++++++++++@",
+" .#++++++++++++@",
+"  .@@++++++++++@",
+"   ..@@@@@@@@@@@",
+"     ..........."};
diff --git a/themes/default-4.0/bottom-left-inactive.xpm b/themes/default-4.0/bottom-left-inactive.xpm
index f0c93c2b5..1e2a6b583 100644
--- a/themes/default-4.0/bottom-left-inactive.xpm
+++ b/themes/default-4.0/bottom-left-inactive.xpm
@@ -2,24 +2,24 @@
 static char * bottom_left_inactive_xpm[] = {
 "16 16 6 1",
 "       c None",
-".      c #4B58A2 s inactive_shadow_1",
+".      c #000000",
 "+      c #525FAB s inactive_color_1",
+"@      c #4B58A2 s inactive_shadow_1",
 "#      c #FFFFFF s inactive_hilight_1",
 "$      c #848FD6 s inactive_mid_1",
-"@      c #000000",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++          ",
-"@.$+++++++++++++",
-" @.$++++++++++++",
-" @.$$+++++++++++",
-"  @..$$$$$$$$$$$",
-"   @@...........",
-"     @@@@@@@@@@@"};
+".+@@@@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#+++@          ",
+".#++++@@@@@@@@@@",
+" .#++++++++++++@",
+" .#++++++++++++@",
+"  .@@++++++++++@",
+"   ..@@@@@@@@@@@",
+"     ..........."};
diff --git a/themes/default-4.0/bottom-right-active.xpm b/themes/default-4.0/bottom-right-active.xpm
index d04b3933b..285d67e08 100644
--- a/themes/default-4.0/bottom-right-active.xpm
+++ b/themes/default-4.0/bottom-right-active.xpm
@@ -4,22 +4,22 @@ static char * bottom_right_active_xpm[] = {
 "       c None",
 ".      c #4B58A2 s active_shadow_1",
 "+      c #525FAB s active_color_1",
+"@      c #000000",
 "#      c #FFFFFF s active_hilight_1",
 "$      c #848FD6 s active_mid_1",
-"@      c #000000",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"+++++++++++++$.@",
-"++++++++++++$.@ ",
-"+++++++++++$$.@ ",
-"$$$$$$$$$$$..@  ",
+"          .....@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"..........++++.@",
+".++++++++++++.@ ",
+".++++++++++++.@ ",
+".++++++++++..@  ",
 "...........@@   ",
 "@@@@@@@@@@@     "};
diff --git a/themes/default-4.0/bottom-right-inactive.xpm b/themes/default-4.0/bottom-right-inactive.xpm
index 8e929bd73..c7d0d6229 100644
--- a/themes/default-4.0/bottom-right-inactive.xpm
+++ b/themes/default-4.0/bottom-right-inactive.xpm
@@ -4,22 +4,22 @@ static char * bottom_right_inactive_xpm[] = {
 "       c None",
 ".      c #4B58A2 s inactive_shadow_1",
 "+      c #525FAB s inactive_color_1",
+"@      c #000000",
 "#      c #FFFFFF s inactive_hilight_1",
 "$      c #848FD6 s inactive_mid_1",
-"@      c #000000",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"          +++$.@",
-"+++++++++++++$.@",
-"++++++++++++$.@ ",
-"+++++++++++$$.@ ",
-"$$$$$$$$$$$..@  ",
+"          .....@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"          .+++.@",
+"..........++++.@",
+".++++++++++++.@ ",
+".++++++++++++.@ ",
+".++++++++++..@  ",
 "...........@@   ",
 "@@@@@@@@@@@     "};
diff --git a/themes/default-4.0/close-active.xpm b/themes/default-4.0/close-active.xpm
index cb3bdd772..450d90bca 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * close_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * close_active_xpm[] = {
 "++++@@$+++$@@++++",
 "++++$$+++++$$++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/close-inactive.xpm b/themes/default-4.0/close-inactive.xpm
index 78bb106d2..e7fb35d3d 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * close_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * close_inactive_xpm[] = {
 "++++$$+++++$$++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/close-pressed.xpm b/themes/default-4.0/close-pressed.xpm
index a6c4a82b6..c17aa8008 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * close_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * close_pressed_xpm[] = {
 ".@@@..@@@@@..@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "}:
 
diff --git a/themes/default-4.0/hide-active.xpm b/themes/default-4.0/hide-active.xpm
index ac61bd12a..55415b26b 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * hide_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * hide_active_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/hide-inactive.xpm b/themes/default-4.0/hide-inactive.xpm
index 65ef8890b..203a5ff64 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * hide_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * hide_inactive_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/hide-pressed.xpm b/themes/default-4.0/hide-pressed.xpm
index efc7eb1b8..f27612df8 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * hide_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * hide_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default-4.0/left-active.xpm b/themes/default-4.0/left-active.xpm
index 9ec0d6b7c..09059d1d6 100644
--- a/themes/default-4.0/left-active.xpm
+++ b/themes/default-4.0/left-active.xpm
@@ -7,35 +7,35 @@ static char * left_active_xpm[] = {
 "#      c #D5D6D5 s active_color_2",
 "*      c #B4BAB4 s active_mid_2",
 "@      c #000000",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*### "};
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####"};
diff --git a/themes/default-4.0/left-inactive.xpm b/themes/default-4.0/left-inactive.xpm
index ff0710a87..ab6a22fcf 100644
--- a/themes/default-4.0/left-inactive.xpm
+++ b/themes/default-4.0/left-inactive.xpm
@@ -7,35 +7,35 @@ static char * left_inactive_xpm[] = {
 "#      c #D5D6D5 s inactive_color_2",
 "*      c #B4BAB4 s inactive_mid_2",
 "@      c #000000",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*###",
-"@.*### "};
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####",
+"@+####"};
diff --git a/themes/default-4.0/maximize-active.xpm b/themes/default-4.0/maximize-active.xpm
index eb40ed9de..0cb925dd9 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_active_xpm[] = {
 "++++@@@@@@@@@++++",
 "++++$$$$$$$$$++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/maximize-inactive.xpm b/themes/default-4.0/maximize-inactive.xpm
index e7bf09709..953ecf859 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * maximize_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_inactive_xpm[] = {
 "++++$$$$$$$$$++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/maximize-pressed.xpm b/themes/default-4.0/maximize-pressed.xpm
index d80c65eaf..ec76186b7 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ 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 19ab7be94..db88bcb51 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 447c3568f..6fc9542db 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 a3e7d1e57..f5756eb84 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ 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 736cc32fe..2a6b49b4c 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * menu_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * menu_active_xpm[] = {
 "+++++++$@$+++++++",
 "++++++++$++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/menu-inactive.xpm b/themes/default-4.0/menu-inactive.xpm
index 85fd35009..f49d253d3 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * menu_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * menu_inactive_xpm[] = {
 "++++++++$++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/menu-pressed.xpm b/themes/default-4.0/menu-pressed.xpm
index 9c59c954c..91807ff55 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * menu_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * menu_pressed_xpm[] = {
 ".@@@@@@@.@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default-4.0/shade-active.xpm b/themes/default-4.0/shade-active.xpm
index 61502a82d..afbf0f992 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_active_xpm[] = {
 "+++@@@@@@@@@@@+++",
 "+++###########+++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/shade-inactive.xpm b/themes/default-4.0/shade-inactive.xpm
index f549c142b..9d9ebf8a3 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * shade_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_inactive_xpm[] = {
 "+++###########+++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/shade-pressed.xpm b/themes/default-4.0/shade-pressed.xpm
index 35d609b99..f2a710a3e 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ 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 6bcdbaaf2..83edc0667 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 7bc8af11f..82d9a0fde 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 2f2b30570..e04c0fb2c 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ 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 659abf79a..f40b7c179 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_active_xpm[] = {
 "+++++++++$+++$+++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/stick-inactive.xpm b/themes/default-4.0/stick-inactive.xpm
index 16a9a6ec6..7a99b07c4 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * stick_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_inactive_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default-4.0/stick-pressed.xpm b/themes/default-4.0/stick-pressed.xpm
index 657a35795..fccc2c6aa 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ 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 864307503..cf2d8a319 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 4766b1021..164544c4d 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ 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 57ce7280f..d5cac642e 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #B4BAB4 s active_mid_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................@",
 ".+++++++++++++++=",
 ".+++++++++++++++=",
@@ -24,5 +25,6 @@ static char * stick_toggled_pressed_xpm[] = {
 ".++++++++...++++=",
 ".+++++++++++++++=",
 ".+++++++++++++++=",
-"@================"};
+"@================",
+"                 "};
 
diff --git a/themes/default-4.0/themerc b/themes/default-4.0/themerc
index b39f2670f..bebfca7ab 100644
--- a/themes/default-4.0/themerc
+++ b/themes/default-4.0/themerc
@@ -1,5 +1,5 @@
-button_offset=1
-button_spacing=1
+button_offset=0
+button_spacing=2
 full_width_title=true
 title_horizontal_offset=0
 title_vertical_offset_active=1
diff --git a/themes/default-4.0/title-1-active.xpm b/themes/default-4.0/title-1-active.xpm
index 6e35b0c57..35be1f87e 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 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,4 +24,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 14e72e85d..013be6b1f 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 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,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 50f5587b1..1f78d18c4 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 18 10 1",
+"16 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -12,20 +12,22 @@ static char * title_2_active_xpm[] = {
 "*	c #949594 s active_shadow_2",
 "=	c #FFFFFF s active_hilight_1",
 "................",
-"+++++===========",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@@$$$$$$$$$$",
-"@@@@@@$$$$$$$$$$",
-"@@@@@@@$$$$$$$$$",
-"@@@@@@@@$$$$$$$$",
-"@@@@@@@@@@$$$$$$"};
+"+++++$==========",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@@#$$$$$$$$$",
+"@@@@@@#$$$$$$$$$",
+"@@@@@@@#$$$$$$$$",
+"@@@@@@@@##$$$$$$",
+"&&&&&&&&&&######"};
diff --git a/themes/default-4.0/title-2-inactive.xpm b/themes/default-4.0/title-2-inactive.xpm
index f9d31752b..3e6c8b964 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 18 10 1",
+"16 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -12,20 +12,22 @@ static char * title_2_inactive_xpm[] = {
 "*	c #949594 s inactive_shadow_2",
 "=	c #FFFFFF s inactive_hilight_1",
 "................",
-"+++++===========",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@@$$$$$$$$$$",
-"@@@@@@$$$$$$$$$$",
-"@@@@@@@$$$$$$$$$",
-"@@@@@@@@$$$$$$$$",
-"@@@@@@@@@@$$$$$$"};
+"+++++$==========",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@@#$$$$$$$$$",
+"@@@@@@#$$$$$$$$$",
+"@@@@@@@#$$$$$$$$",
+"@@@@@@@@##$$$$$$",
+"&&&&&&&&&&######"};
diff --git a/themes/default-4.0/title-3-active.xpm b/themes/default-4.0/title-3-active.xpm
index 2ad2dd2a2..471ebfb23 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 18 10 1",
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -28,4 +28,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 4d4633a37..057b8799f 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 18 10 1",
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -28,4 +28,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 f0bcbc328..1d58be4aa 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 18 10 1",
+"16 20 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s active_hilight_2",
@@ -12,20 +12,22 @@ static char * title_4_active_xpm[] = {
 "*      c #B4BAB4 s active_mid_2",
 "=      c #FFFFFF s active_hilight_1",
 "................",
-"===========+++++",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&@@@@@@@",
-"&&&&&&&&@@@@@@@@",
-"&&&&&&@@@@@@@@@@"};
+"==========&+++++",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&$@@@@@@",
+"&&&&&&&&&$@@@@@@",
+"&&&&&&&&$@@@@@@@",
+"&&&&&&$$@@@@@@@@",
+"$$$$$$**********"};
diff --git a/themes/default-4.0/title-4-inactive.xpm b/themes/default-4.0/title-4-inactive.xpm
index d9002ed59..605b02464 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 18 10 1",
+"16 20 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -12,20 +12,22 @@ static char * title_4_inactive_xpm[] = {
 "*      c #B4BAB4 s inactive_mid_2",
 "=      c #FFFFFF s inactive_hilight_1",
 "................",
-"===========+++++",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&@@@@@@@",
-"&&&&&&&&@@@@@@@@",
-"&&&&&&@@@@@@@@@@"};
+"==========&+++++",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&$@@@@@@",
+"&&&&&&&&&$@@@@@@",
+"&&&&&&&&$@@@@@@@",
+"&&&&&&$$@@@@@@@@",
+"$$$$$$**********"};
diff --git a/themes/default-4.0/title-5-active.xpm b/themes/default-4.0/title-5-active.xpm
index af62128a3..4cf732bb3 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 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,4 +24,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 ea45ab05a..64acccf23 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 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,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 67ebc959e..396789a5e 100644
--- a/themes/default-4.0/top-left-active.xpm
+++ b/themes/default-4.0/top-left-active.xpm
@@ -1,27 +1,29 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"7 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
-"+      c #FFFFFF s active_hilight_2",
-"@      c #B4BAB4 s active_mid_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #FFFFFF s active_hilight_2",
 "#      c #D5D6D5 s active_color_2",
 "$      c #000000",
-"      $",
-"    $$+",
-"   $++#",
-"  $@###",
+"     $$",
+"   $$@@",
+"  $@@##",
 " $@####",
 " $@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####""};
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####"};
diff --git a/themes/default-4.0/top-left-inactive.xpm b/themes/default-4.0/top-left-inactive.xpm
index 8353adcf7..b29e1fd10 100644
--- a/themes/default-4.0/top-left-inactive.xpm
+++ b/themes/default-4.0/top-left-inactive.xpm
@@ -1,27 +1,29 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"7 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
-"+      c #FFFFFF s inactive_hilight_2",
-"@      c #B4BAB4 s inactive_mid_2",
+"+      c #B4BAB4 s inactive_mid_2",
+"@      c #FFFFFF s inactive_hilight_2",
 "#      c #D5D6D5 s inactive_color_2",
 "$      c #000000",
-"      $",
-"    $$+",
-"   $++#",
-"  $@###",
+"     $$",
+"   $$@@",
+"  $@@##",
 " $@####",
 " $@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
-"$.@####""};
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####",
+"$@#####"};
diff --git a/themes/default-4.0/top-right-active.xpm b/themes/default-4.0/top-right-active.xpm
index 47e087ff3..1028ddb59 100644
--- a/themes/default-4.0/top-right-active.xpm
+++ b/themes/default-4.0/top-right-active.xpm
@@ -1,18 +1,19 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"7 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #FFFFFF s active_hilight_2",
 "@      c #B4BAB4 s active_mid_2",
 "#      c #D5D6D5 s active_color_2",
 "$      c #000000",
-"$      ",
-"+$$    ",
-"#++$   ",
-"###@$  ",
-"####@$ ",
-"####@$ ",
+"$$     ",
+"++$$   ",
+"##+#$  ",
+"###@.$ ",
+"###@.$ ",
+"####@.$",
+"####@.$",
 "####@.$",
 "####@.$",
 "####@.$",
diff --git a/themes/default-4.0/top-right-inactive.xpm b/themes/default-4.0/top-right-inactive.xpm
index 8a60fc0ad..f0dd2cecd 100644
--- a/themes/default-4.0/top-right-inactive.xpm
+++ b/themes/default-4.0/top-right-inactive.xpm
@@ -1,18 +1,20 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"7 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
 "+      c #FFFFFF s inactive_hilight_2",
 "@      c #B4BAB4 s inactive_mid_2",
 "#      c #D5D6D5 s inactive_color_2",
 "$      c #000000",
-"$      ",
-"+$$    ",
-"#++$   ",
-"###@$  ",
-"####@$ ",
-"####@$ ",
+"$$     ",
+"++$$   ",
+"##+#$  ",
+"###@.$ ",
+"###@.$ ",
+"####@.$",
+"####@.$",
+"####@.$",
 "####@.$",
 "####@.$",
 "####@.$",
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index cb3bdd772..450d90bca 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * close_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * close_active_xpm[] = {
 "++++@@$+++$@@++++",
 "++++$$+++++$$++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 78bb106d2..e7fb35d3d 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * close_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * close_inactive_xpm[] = {
 "++++$$+++++$$++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index a6c4a82b6..c17aa8008 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * close_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * close_pressed_xpm[] = {
 ".@@@..@@@@@..@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "}:
 
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index ac61bd12a..55415b26b 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * hide_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * hide_active_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 65ef8890b..203a5ff64 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * hide_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * hide_inactive_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index efc7eb1b8..f27612df8 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * hide_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * hide_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index eb40ed9de..0cb925dd9 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_active_xpm[] = {
 "++++@@@@@@@@@++++",
 "++++$$$$$$$$$++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index e7bf09709..953ecf859 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * maximize_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_inactive_xpm[] = {
 "++++$$$$$$$$$++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index d80c65eaf..ec76186b7 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * maximize_pressed_xpm[] = {
 ".@@@.........@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 19ab7be94..db88bcb51 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_toggled_active_xpm[] = {
 "++++++########+++",
 "++++++@@@@@@@@+++",
 "++++++$$$$$$$$+++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 447c3568f..6fc9542db 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * maximize_toggled_inactive_xpm[] = {
 "++++++@@@@@@@@+++",
 "++++++$$$$$$$$+++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index a3e7d1e57..f5756eb84 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * maximize_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * maximize_toggled_pressed_xpm[] = {
 ".@@@@@########@@=",
 ".@@@@@........@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 736cc32fe..2a6b49b4c 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * menu_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * menu_active_xpm[] = {
 "+++++++$@$+++++++",
 "++++++++$++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 85fd35009..f49d253d3 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * menu_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * menu_inactive_xpm[] = {
 "++++++++$++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 9c59c954c..91807ff55 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * menu_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * menu_pressed_xpm[] = {
 ".@@@@@@@.@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 61502a82d..afbf0f992 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_active_xpm[] = {
 "+++@@@@@@@@@@@+++",
 "+++###########+++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index f549c142b..9d9ebf8a3 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * shade_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_inactive_xpm[] = {
 "+++###########+++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 35d609b99..f2a710a3e 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * shade_pressed_xpm[] = {
 ".@@...........@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 6bcdbaaf2..83edc0667 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_toggled_active_xpm[] = {
 "+++@@@@@@@@@@@+++",
 "+++###########+++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 7bc8af11f..82d9a0fde 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * shade_toggled_inactive_xpm[] = {
 "+++###########+++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 2f2b30570..e04c0fb2c 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * shade_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * shade_toggled_pressed_xpm[] = {
 ".@@...........@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 659abf79a..f40b7c179 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_active_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s active_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_active_xpm[] = {
 "+++++++++$+++$+++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 16a9a6ec6..7a99b07c4 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * stick_inactive_xpm[] = {
 "#      c #000000",
 "$      c #B4BAB4 s inactive_mid_2",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_inactive_xpm[] = {
 "+++++++++++++++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 657a35795..fccc2c6aa 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................+",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
@@ -24,5 +25,6 @@ static char * stick_pressed_xpm[] = {
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
 ".@@@@@@@@@@@@@@@=",
-"+================"};
+"+================",
+"                 "};
 
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 864307503..cf2d8a319 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s active_hilight_2",
 "+      c #D5D6D5 s active_color_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_active_xpm[] = {
 "#      c #B4BAB4 s active_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_toggled_active_xpm[] = {
 "+++++++++###+++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 4766b1021..164544c4d 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #FFFFFF s inactive_hilight_2",
 "+      c #D5D6D5 s inactive_color_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_inactive_xpm[] = {
 "#      c #B4BAB4 s inactive_mid_2",
 "$      c #000000",
 "                 ",
+"                 ",
 ".................",
 "+++++++++++++++++",
 "+++++++++++++++++",
@@ -24,5 +25,6 @@ static char * stick_toggled_inactive_xpm[] = {
 "+++++++++###+++++",
 "+++++++++++++++++",
 "+++++++++++++++++",
-"+++++++++++++++++"};
+"+++++++++++++++++",
+"                 "};
 
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 57ce7280f..d5cac642e 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[] = {
-"17 18 6 1",
+"17 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #B4BAB4 s active_mid_2",
@@ -8,6 +8,7 @@ static char * stick_toggled_pressed_xpm[] = {
 "=      c #FFFFFF s active_hilight_2",
 "#      c #000000",
 "                 ",
+"                 ",
 "................@",
 ".+++++++++++++++=",
 ".+++++++++++++++=",
@@ -24,5 +25,6 @@ static char * stick_toggled_pressed_xpm[] = {
 ".++++++++...++++=",
 ".+++++++++++++++=",
 ".+++++++++++++++=",
-"@================"};
+"@================",
+"                 "};
 
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 6e35b0c57..35be1f87e 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"8 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,4 +24,6 @@ static char * title_1_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"########"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 14e72e85d..013be6b1f 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"8 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,6 @@ static char * title_1_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"########"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 50f5587b1..51d639335 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_active_xpm[] = {
-"16 18 10 1",
+"16 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,8 +24,10 @@ static char * title_2_active_xpm[] = {
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@@$$$$$$$$$",
 "@@@@@@@@$$$$$$$$",
-"@@@@@@@@@@$$$$$$"};
+"&&&&&&&&&&%%%%%%"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index f9d31752b..2132b3dd9 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_inactive_xpm[] = {
-"16 18 10 1",
+"16 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,10 @@ static char * title_2_inactive_xpm[] = {
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
 "@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@$$$$$$$$$$",
 "@@@@@@@$$$$$$$$$",
 "@@@@@@@@$$$$$$$$",
-"@@@@@@@@@@$$$$$$"};
+"&&&&&&&&&&%%%%%%"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 2ad2dd2a2..8d5f3405e 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_active_xpm[] = {
-"20 18 10 1",
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -28,4 +28,6 @@ static char * title_3_active_xpm[] = {
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%"};
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 4d4633a37..8dde26904 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_inactive_xpm[] = {
-"20 18 10 1",
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -28,4 +28,6 @@ static char * title_3_inactive_xpm[] = {
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%"};
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index f0bcbc328..e84ea1fb1 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_active_xpm[] = {
-"16 18 10 1",
+"16 20 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s active_hilight_2",
@@ -24,8 +24,10 @@ static char * title_4_active_xpm[] = {
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&@@@@@@@",
 "&&&&&&&&@@@@@@@@",
-"&&&&&&@@@@@@@@@@"};
+"%%%%%%**********"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index d9002ed59..70a32be7e 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_inactive_xpm[] = {
-"16 18 10 1",
+"16 20 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,10 @@ static char * title_4_inactive_xpm[] = {
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&&@@@@@@",
 "&&&&&&&&&@@@@@@@",
 "&&&&&&&&@@@@@@@@",
-"&&&&&&@@@@@@@@@@"};
+"%%%%%%**********"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index af62128a3..4cf732bb3 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_active_xpm[] = {
-"8 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s active_shadow_2",
 "+	c #FFFFFF s active_hilight_2",
@@ -24,4 +24,6 @@ static char * title_5_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"########"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index ea45ab05a..64acccf23 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_inactive_xpm[] = {
-"8 18 6 1",
+"8 20 6 1",
 " 	c None",
 ".	c #949594 s inactive_shadow_2",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,6 @@ static char * title_5_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"########"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 67ebc959e..626edf872 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 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #FFFFFF s active_hilight_2",
@@ -24,4 +24,6 @@ static char * top_left_active_xpm[] = {
 "$.@####",
 "$.@####",
 "$.@####",
-"$.@####""};
+"$.@####",
+"$.@####",
+"$.@#@@@"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 8353adcf7..7b0420101 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 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,6 @@ static char * top_left_inactive_xpm[] = {
 "$.@####",
 "$.@####",
 "$.@####",
-"$.@####""};
+"$.@####",
+"$.@####",
+"$.@#@@@"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 47e087ff3..7546cdf01 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 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s active_shadow_2",
 "+      c #FFFFFF s active_hilight_2",
@@ -25,4 +25,5 @@ static char * top_right_active_xpm[] = {
 "####@.$",
 "####@.$",
 "####@.$",
-"####@.$"};
+"####@.$",
+"@@@#@.$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 8a60fc0ad..889f91bc7 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 18 6 1",
+"7 20 6 1",
 "       c None",
 ".      c #949594 s inactive_shadow_2",
 "+      c #FFFFFF s inactive_hilight_2",
@@ -24,4 +24,6 @@ static char * top_right_inactive_xpm[] = {
 "####@.$",
 "####@.$",
 "####@.$",
-"####@.$"};
+"####@.$",
+"####@.$",
+"@@@#@.$"};
-- 
GitLab