From e2ae43a5f5960f03b4ac411135549d004e1e2d3a Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Fri, 30 Jan 2004 11:56:47 +0000
Subject: [PATCH] ic the light now

(Old svn revision: 11558)
---
 themes/default/close-active.xpm              | 60 +++++++++---------
 themes/default/close-inactive.xpm            | 60 +++++++++---------
 themes/default/close-pressed.xpm             | 58 +++++++++--------
 themes/default/hide-active.xpm               | 60 +++++++++---------
 themes/default/hide-inactive.xpm             | 60 +++++++++---------
 themes/default/hide-pressed.xpm              | 58 +++++++++--------
 themes/default/maximize-active.xpm           | 60 +++++++++---------
 themes/default/maximize-inactive.xpm         | 60 +++++++++---------
 themes/default/maximize-pressed.xpm          | 58 +++++++++--------
 themes/default/maximize-toggled-active.xpm   | 60 +++++++++---------
 themes/default/maximize-toggled-inactive.xpm | 60 +++++++++---------
 themes/default/maximize-toggled-pressed.xpm  | 58 +++++++++--------
 themes/default/menu-active.xpm               | 60 +++++++++---------
 themes/default/menu-inactive.xpm             | 60 +++++++++---------
 themes/default/menu-pressed.xpm              | 58 +++++++++--------
 themes/default/shade-active.xpm              | 60 +++++++++---------
 themes/default/shade-inactive.xpm            | 60 +++++++++---------
 themes/default/shade-pressed.xpm             | 58 +++++++++--------
 themes/default/shade-toggled-active.xpm      | 60 +++++++++---------
 themes/default/shade-toggled-inactive.xpm    | 60 +++++++++---------
 themes/default/shade-toggled-pressed.xpm     | 58 +++++++++--------
 themes/default/stick-active.xpm              | 61 +++++++++---------
 themes/default/stick-inactive.xpm            | 60 +++++++++---------
 themes/default/stick-pressed.xpm             | 58 +++++++++--------
 themes/default/stick-toggled-active.xpm      | 61 +++++++++---------
 themes/default/stick-toggled-inactive.xpm    | 60 +++++++++---------
 themes/default/stick-toggled-pressed.xpm     | 58 +++++++++--------
 themes/default/themerc                       |  2 +-
 themes/default/title-1-active.xpm            | 17 ++---
 themes/default/title-1-inactive.xpm          | 17 ++---
 themes/default/title-2-active.xpm            | 63 ++++++++++---------
 themes/default/title-2-inactive.xpm          | 63 ++++++++++---------
 themes/default/title-3-active.xpm            | 63 ++++++++++---------
 themes/default/title-3-inactive.xpm          | 63 ++++++++++---------
 themes/default/title-4-active.xpm            | 65 +++++++++++---------
 themes/default/title-4-inactive.xpm          | 65 +++++++++++---------
 themes/default/title-5-active.xpm            | 17 ++---
 themes/default/title-5-inactive.xpm          | 17 ++---
 themes/default/top-left-active.xpm           | 17 ++---
 themes/default/top-left-inactive.xpm         | 17 ++---
 themes/default/top-right-active.xpm          | 17 ++---
 themes/default/top-right-inactive.xpm        | 17 ++---
 42 files changed, 1116 insertions(+), 1008 deletions(-)

diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index f7a1d4479..e59d70e9e 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++##+++++##++++",
+"++++###+++###++++",
+"++++@###+###@++++",
+"++++$@#####@$++++",
+"+++++$@###@$+++++",
+"++++++#####++++++",
+"+++++###@###+++++",
+"++++###@$@###++++",
+"++++##@$+$@##++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 315824440..2729a6006 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@+++++@@++++",
+"++++@@@+++@@@++++",
+"++++$@@@+@@@$++++",
+"+++++$@@@@@$+++++",
+"++++++$@@@$++++++",
+"++++++@@@@@++++++",
+"+++++@@@$@@@+++++",
+"++++@@@$+$@@@++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index f20d9b82f..c5fab1a65 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++@@++++@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@++++@@++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@##@@@@@##@@@=",
+".@@@###@@@###@@@=",
+".@@@.###@###.@@@=",
+".@@@@.#####.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@###.###@@@@=",
+".@@@###.@.###@@@=",
+".@@@##.@@@.##@@@=",
+".@@@..@@@@@..@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index ca2e65ad3..6aa86d98a 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++##+##++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index e3c7e29c8..3e0d27e87 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++@@+@@++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index a116b50c9..99df7f583 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++@@@@@@+++++.",
-".+++++@@@@@@+++++.",
-".+++++@@@@@@+++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@##@##@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@.....@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index c0713f951..aca2b0282 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++#########++++",
+"++++#########++++",
+"++++##@@@@@##++++",
+"++++##$$$$$##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++#########++++",
+"++++#########++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 37abe73ef..b3e7898e1 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index a8104a073..c28e3ddec 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++@@@@@@@@++++.",
-".++++@@@@@@@@++++.",
-".++++@@@@@@@@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@@@@@@@@++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@#########@@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@#########@@@=",
+".@@@#########@@@=",
+".@@@.........@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 6a56448c3..4f37af901 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@@@@@@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$@@@@@$@$$@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$$$$$$$@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++########++++++",
+"+++########++++++",
+"+++##@@@@##++++++",
+"+++##$$$$##@##+++",
+"+++##++++##@##+++",
+"+++##++++##+##+++",
+"+++########+##+++",
+"+++########+##+++",
+"+++@@@@@++++##+++",
+"+++$$$########+++",
+"++++++########+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 0bed3172b..26f3959f1 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@@@@@@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$@@@@@$@$$@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$$$$$$$@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@++++++",
+"+++@@@@@@@@++++++",
+"+++@@$$$$@@++++++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++$$$$$++++@@+++",
+"++++++@@@@@@@@+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 5d0ec6009..b55493b11 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++@@@@@@@+++.",
-".++++++@@@@@@@+++.",
-".++++++++++++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@+++++@+@@+++.",
-".+++@+++++@++++++.",
-".+++@+++++@++++++.",
-".+++@@@@@@@++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@########@@@@@=",
+".@@########@@@@@=",
+".@@##....##@@@@@=",
+".@@##@@@@##.##@@=",
+".@@##@@@@##.##@@=",
+".@@##@@@@##@##@@=",
+".@@########@##@@=",
+".@@########@##@@=",
+".@@.....@@@@##@@=",
+".@@@@@########@@=",
+".@@@@@########@@=",
+".@@@@@........@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 192017ea1..b048710ce 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$@@@@$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++###########+++",
+"+++###########+++",
+"+++@@@@@@@@@@@+++",
+"+++$#########$+++",
+"++++##@@@@@##++++",
+"++++@##$$$##@++++",
+"++++$@##+##@$++++",
+"+++++$@###@$+++++",
+"++++++$@#@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 6e4be7fc3..896f47891 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$@@@@$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++$$$$$$$$$$$+++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++$@@+++@@$++++",
+"+++++$@@+@@$+++++",
+"++++++$@@@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 1933fcd73..decb9f993 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++@++++@+++++.",
-".++++@@@++@@@++++.",
-".++++@@@@@@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@.##.@.##.@@@=",
+".@@@@.##.##.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@@.#.@@@@@@=",
+".@@@@@@@.@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index ffea0d122..401a9930a 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++$++++++++",
+"+++++++$$$+++++++",
+"++++++$$@$$++++++",
+"+++++$$@#@$$+++++",
+"++++$$@#+#@$$++++",
+"++++$$$$$$$$$++++",
+"++++@@@@@@@@@++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 78c463fed..83840b7cc 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++@++++++++",
+"+++++++@@@+++++++",
+"++++++@@#@@++++++",
+"+++++@@#+#@@+++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++#########++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 167ac92a4..d6289ec8f 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++++@@+++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@@@@@@++++.",
-".++++@@+@@+@@++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@#@@@@@@@=",
+".@@@@@@###@@@@@@=",
+".@@@@@##.##@@@@@=",
+".@@@@##.@.##@@@@=",
+".@@@##.@@@.##@@@=",
+".@@@#########@@@=",
+".@@@.........@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 23126f05a..3ced6cc9b 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++$$$$$$$$$++++",
+"++++$$@@@@@$$++++",
+"++++@$$###$$@++++",
+"++++#@$$+$$@#++++",
+"+++++#@$$$@#+++++",
+"++++++#@$@#++++++",
+"+++++++#@#+++++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 40d734a28..a2dfe103d 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@#####@@++++",
+"++++#@@+++@@#++++",
+"+++++#@@+@@#+++++",
+"++++++#@@@#++++++",
+"+++++++#@#+++++++",
+"++++++++#++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index c212062d9..7bdf8ee08 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".++++@@+@@+@@++++.",
-".++++@@@@@@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@.##@@@##.@@@=",
+".@@@@.##@##.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@@.#.@@@@@@=",
+".@@@@@@@.@@@@@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 6759c4893..91a456722 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,32 +1,33 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 22 7 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #949595 s active_shadow_2",
-"%	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@%%@@@@%%@@@#.",
-".+@@@%%@@@@%%@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++#+++#+++",
+"+++++++++#####+++",
+"+++@######++##+++",
+"+++#$$$$$#$$##+++",
+"+++@######@@##+++",
+"+++$@@@@@#####+++",
+"++++$$$$$#@@@#+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 51b94bd12..b0f82bb7c 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++@+++@+++",
+"+++++++++@@@@@+++",
+"+++$@@@@@@++@@+++",
+"+++@$$$$$@$$@@+++",
+"+++$@@@@@@$$@@+++",
+"++++$$$$$@@@@@+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 881924ba1..0e8d2bf9f 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@++++@@++++.",
-".++++@@++++@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@#@@@#@@=",
+".@@@@@@@@#####@@=",
+".@@.######@@##@@=",
+".@@#.....#..##@@=",
+".@@.######..##@@=",
+".@@@.....#####@@=",
+".@@@@@@@@#...#@@=",
+".@@@@@@@@.@@@.@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index bd2bc5a77..c37b76560 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,32 +1,33 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 22 7 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #949595 s active_shadow_2",
-"%	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@%%@%%@%%@@@#.",
-".+@@@%%@%%@%%@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#$$$#++++++",
+"+++++#$++@$#+++++",
+"+++++$+++#@$#++++",
+"+++++$++$#@$@++++",
+"+++++$@###@$@#+++",
+"+++++#$@@@$@@#+++",
+"++++++#$$$@@##+++",
+"+++++++#@@@##++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 37e405921..8bf89a553 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 22 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#@@@#++++++",
+"+++++#@++#@#+++++",
+"+++++@+++##@#++++",
+"+++++@++@##@#++++",
+"+++++@#####@##+++",
+"+++++#@###@###+++",
+"++++++#@@@####+++",
+"+++++++######++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index a45153d6c..f63746990 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,29 +1,33 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"18 22 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@+@@+@@++++.",
-".++++@@+@@+@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  "};
+"17 23 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #D5D6D5 s active_color_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"                 ",
+"................@",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++.###.+++++=",
+".++++.#@@.#.++++=",
+".++++#@@@+.#.+++=",
+".++++#@@#+.#.+++=",
+".++++#.+++.#..++=",
+".++++.#...#...++=",
+".+++++.###....++=",
+".++++++......+++=",
+".++++++++...++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+"@================",
+"                 ",
+"                 "};
+
diff --git a/themes/default/themerc b/themes/default/themerc
index 1168c0f4b..0d4854bd6 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,4 +1,4 @@
-button_offset=1
+button_offset=2
 button_spacing=2
 full_width_title=true
 title_horizontal_offset=0
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 5fd36c68b..a8f3200e6 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,15 +1,14 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"8 22 6 1",
+static char * title_1_active_xpm[] = {
+"8 23 6 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
 "$	c #000000",
 "$$$$$$$$",
 "$$$$$$$$",
-"++++++++",
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
@@ -28,4 +27,6 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"........"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index d66f243a1..aa4a82c12 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,15 +1,14 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 22 6 1",
+static char * title_1_inactive_xpm[] = {
+"8 23 6 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
+".	c #949594 s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB4 s inactive_mid_2",
 "$	c #000000",
 "$$$$$$$$",
 "$$$$$$$$",
-"++++++++",
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
@@ -28,4 +27,6 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"........"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 5fd36c68b..be6df60dd 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"8 22 6 1",
+static char * title_2_active_xpm[] = {
+"16 23 10 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".	c #000000",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #4B58A2 s active_shadow_1",
+"$	c #525FAB s active_color_1",
+"%	c #848FD6 s active_mid_1",
+"&	c #B4BAB4 s active_mid_2",
+"*	c #949594 s active_shadow_2",
+"=	c #FFFFFF s active_hilight_1",
+"................",
+"................",
+"@@@@@#==========",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"*****###########"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index d66f243a1..76be6cabf 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 22 6 1",
+static char * title_2_inactive_xpm[] = {
+"16 23 10 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".	c #000000",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #525FAB s inactive_color_1",
+"%	c #848FD6 s inactive_mid_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"................",
+"................",
+"@@@@@#==========",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"*****###########"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 5fd36c68b..01eb11347 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"8 22 6 1",
+static char * title_3_active_xpm[] = {
+"20 23 10 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".	c #000000",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #4B58A2 s active_shadow_1",
+"$	c #848FD6 s active_mid_1",
+"%	c #525FAB s active_color_1",
+"&	c #B4BAB4 s active_mid_2",
+"*	c #949594 s active_shadow_2",
+"=	c #FFFFFF s active_hilight_1",
+"....................",
+"....................",
+"====================",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"####################"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index d66f243a1..d8c4779a7 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 22 6 1",
+static char * title_3_inactive_xpm[] = {
+"20 23 10 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".	c #000000",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #848FD6 s inactive_mid_1",
+"%	c #525FAB s inactive_color_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"....................",
+"....................",
+"====================",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"####################"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 5fd36c68b..111484e58 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"8 22 6 1",
-" 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+static char * title_4_active_xpm[] = {
+"16 23 10 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #D5D6D5 s active_color_2",
+"#      c #949594 s active_shadow_2",
+"$      c #4B58A2 s active_shadow_1",
+"%      c #848FD6 s active_mid_1",
+"&      c #525FAB s active_color_1",
+"*      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_1",
+"................",
+"................",
+"==========$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"$$$$$$$$$$$#####"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index d66f243a1..5b976fae0 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,31 +1,36 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 22 6 1",
-" 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+static char * title_4_inactive_xpm[] = {
+"16 23 10 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #949594 s inactive_shadow_2",
+"$      c #4B58A2 s inactive_shadow_1",
+"%      c #848FD6 s inactive_mid_1",
+"&      c #525FAB s inactive_color_1",
+"*      c #B4BAB4 s inactive_mid_2",
+"=      c #FFFFFF s inactive_hilight_1",
+"................",
+"................",
+"==========$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"$$$$$$$$$$$#####"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 5fd36c68b..0f7889f72 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,15 +1,14 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"8 22 6 1",
+static char * title_5_active_xpm[] = {
+"8 23 6 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
 "$	c #000000",
 "$$$$$$$$",
 "$$$$$$$$",
-"++++++++",
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
@@ -28,4 +27,6 @@ static char * title_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"........"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index d66f243a1..464228f19 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,15 +1,14 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 22 6 1",
+static char * title_5_inactive_xpm[] = {
+"8 23 6 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
+".	c #949594 s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB4 s inactive_mid_2",
 "$	c #000000",
 "$$$$$$$$",
 "$$$$$$$$",
-"++++++++",
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
@@ -28,4 +27,6 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@"};
+"@@@@@@@@",
+"@@@@@@@@",
+"........"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index ebc14a82a..c1b742369 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"7 22 6 1",
+"7 23 6 1",
 "       c None",
-".      c #949594 s active_shadow_1",
-"+      c #FFFFFF s active_hilight_1",
-"@      c #B4BAB4 s active_mid_1",
-"#      c #D5D6D5 s active_color_1",
+".      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",
 "    $$$",
 "  $$$$$",
-" $$$.++",
-" $$@+##",
+" $$$.@#",
+" $$@###",
 "$$.####",
 "$$@####",
 "$$#####",
@@ -28,4 +28,5 @@ static char * top_left_active_xpm[] = {
 "$$#####",
 "$$#####",
 "$$#####",
-"$$#####"};
+"$$#####",
+"$$##..."};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index c52a47daf..2cd15b676 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"7 22 6 1",
+"7 23 6 1",
 "       c None",
-".      c #949594 s inactive_shadow_1",
-"+      c #FFFFFF s inactive_hilight_1",
-"@      c #B4BAB4 s inactive_mid_1",
-"#      c #D5D6D5 s inactive_color_1",
+".      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",
 "    $$$",
 "  $$$$$",
-" $$$.++",
-" $$@+##",
+" $$$.@#",
+" $$@###",
 "$$.####",
 "$$@####",
 "$$#####",
@@ -28,4 +28,5 @@ static char * top_left_inactive_xpm[] = {
 "$$#####",
 "$$#####",
 "$$#####",
-"$$#####"};
+"$$#####",
+"$$##..."};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 6dbc4b4a9..c0a7441bb 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"7 22 6 1",
+"7 23 6 1",
 "       c None",
-".      c #949594 s active_shadow_1",
-"+      c #FFFFFF s active_hilight_1",
-"@      c #B4BAB4 s active_mid_1",
-"#      c #D5D6D5 s active_color_1",
+".      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",
 "$$$    ",
 "$$$$$  ",
-"++.$$$ ",
-"##+@$$ ",
+"#@.$$$ ",
+"###@$$ ",
 "####.$$",
 "####@$$",
 "#####$$",
@@ -28,4 +28,5 @@ static char * top_right_active_xpm[] = {
 "#####$$",
 "#####$$",
 "#####$$",
-"#####$$"};
+"#####$$",
+"...##$$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 82a87fd00..ac9e14777 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"7 22 6 1",
+"7 23 6 1",
 "       c None",
-".      c #949594 s inactive_shadow_1",
-"+      c #FFFFFF s inactive_hilight_1",
-"@      c #B4BAB4 s inactive_mid_1",
-"#      c #D5D6D5 s inactive_color_1",
+".      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",
 "$$$    ",
 "$$$$$  ",
-"++.$$$ ",
-"##+@$$ ",
+"#@.$$$ ",
+"###@$$ ",
 "####.$$",
 "####@$$",
 "#####$$",
@@ -28,4 +28,5 @@ static char * top_right_inactive_xpm[] = {
 "#####$$",
 "#####$$",
 "#####$$",
-"#####$$"};
+"#####$$",
+"...##$$"};
-- 
GitLab