diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 11095a32589260e07f80b08c5776b2ca8b7140a7..ad3ce298b4d8da10c8353f2e4e1375ebde9a37ea 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -3,9 +3,9 @@ static char * close_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 76e672a2f70e42e99cc99a2c0443180294466539..1ce892044563419e04218f9db5469bf66a09c6a2 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -3,9 +3,9 @@ static char * close_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 2a879255e962fa556338b70b96aec7496d3c0d76..e6ac9d50e0823d66a3b44feb6f80af54a51462f7 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -3,9 +3,9 @@ static char * hide_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index dc19bb95525db4a9dec9bfdb7e9c7f735bf4a029..c020f682b5bc739cc2360efae854e7011c0c897a 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -19,8 +19,8 @@ static char * hide_inactive_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@+####+@@@@@+",
-"+@@@@@+####+@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 19672e4ab66a8a2c76bc3c0a13292ab833770e7d..86cf0cd0cebee11981b5a1a1b3989e707e1be2c3 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -3,9 +3,9 @@ static char * hide_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 3614e29864a5c28470022f5aad3bf61070511405..b7316e170201e1ef573d9a73d519ce6d1b23e5c6 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -3,9 +3,9 @@ static char * maximize_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -13,14 +13,14 @@ static char * maximize_active_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@########@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@########@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index f55c591657a57e5bf64095d2fcf5475aa7b8b0f0..8926f2c2936cc435129fa2d40911293fd5189ed6 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -13,14 +13,14 @@ static char * maximize_inactive_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@########@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@########@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 118196bc8646b45e730535ca6a06fb8e215c1f39..dbb37b8898ef2723669c8f1df80fb186e446fb38 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -3,9 +3,9 @@ static char * maximize_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -13,14 +13,14 @@ static char * maximize_pressed_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@########@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@##@@@@##@@@@+",
 "+@@@@########@@@@+",
-"+@@@@+######+@@@@+",
+"+@@@@.######.@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index cc05835c5ceac7b489ad851c53ef8562581075b4..b253b513951e92e2115ca3b820f77d301cdad64b 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -3,25 +3,25 @@ static char * maximize_toggled_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@+.",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@@+#####+@@@+",
+"+@@@@@@.#####.@@@+",
 "+@@@@@@#######@@@+",
 "+@@@@@@@@@@@##@@@+",
-"+@@@+#####+@##@@@+",
+"+@@@.#####.@##@@@+",
 "+@@@#######@##@@@+",
 "+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@#.@@@+",
 "+@@@##@@@##@@@@@@+",
 "+@@@#######@@@@@@+",
-"+@@@+#####+@@@@@@+",
+"+@@@.#####.@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 ".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 2216d843c532f09727579057b07df37a7238b788..646bfe5b37db0cd7a18b94438723e632fd300c09 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -12,16 +12,16 @@ static char * maximize_toggled_inactive_xpm[] = {
 ".+@@@@@@@@@@@@@@+.",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@@+#####+@@@+",
+"+@@@@@@.#####.@@@+",
 "+@@@@@@#######@@@+",
 "+@@@@@@@@@@@##@@@+",
-"+@@@+#####+@##@@@+",
+"+@@@.#####.@##@@@+",
 "+@@@#######@##@@@+",
 "+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@#.@@@+",
 "+@@@##@@@##@@@@@@+",
 "+@@@#######@@@@@@+",
-"+@@@+#####+@@@@@@+",
+"+@@@.#####.@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 ".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index aea656d35c3c8eff7182f7df1b46303d736a0af8..25777f4dd1bf4a3a39cf4d105ffdfb46b1e135bd 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -3,25 +3,25 @@ static char * maximize_toggled_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
 ".+@@@@@@@@@@@@@@+.",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@@+#####+@@@+",
+"+@@@@@@.#####.@@@+",
 "+@@@@@@#######@@@+",
 "+@@@@@@@@@@@##@@@+",
-"+@@@+#####+@##@@@+",
+"+@@@.#####.@##@@@+",
 "+@@@#######@##@@@+",
 "+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@#.@@@+",
 "+@@@##@@@##@@@@@@+",
 "+@@@#######@@@@@@+",
-"+@@@+#####+@@@@@@+",
+"+@@@.#####.@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 ".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 6287d93b7e2afbd1f42d1a252a9d041c9f925f21..76bc72d7328945754e2b7d278e272635521c5c25 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -3,9 +3,9 @@ static char * menu_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 0e998ef1434d88e7dcb0a41fc70fe7c04ee0b04a..6e11bbba3b5dbe1ea59efcf6ce3672727a008005 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -3,9 +3,9 @@ static char * menu_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index add3ad7a6f46588e5d84e3a3bb2f52aa8b9f4b90..29a09e96b7a216442b05514b2d686f6d3754fb2c 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -3,9 +3,9 @@ static char * shade_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 883016cade6f7f38e4b598367a68ebdedc357a5c..49f2c288b8bc0ab782ad962f2336e90d526e89a2 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -3,9 +3,9 @@ static char * shade_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 9248bb77905588f207e5bd83ba4112fd6f591c2f..7788fcde2e17de7ede8873fc25d40f90406dfa02 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -3,9 +3,9 @@ static char * shade_toggled_active_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index dc2b95903670f595bcca5796562db1a0bbf06b2d..2af82f9ab2f7a767038037f1bd1e8b402db3e5a3 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -3,9 +3,9 @@ static char * shade_toggled_pressed_xpm[] = {
 "18 20 5 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #000000",
+"#	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 6d5ed56ce191b0aa6ab82e96e4bf6625fa551406..ae41991b6b22ff7322ead13372fb255a09ac5d08 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -3,10 +3,10 @@ static char * stick_active_xpm[] = {
 "18 20 6 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #949595 s active_shadow_1",
-"$	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #949595 s active_color_1",
+"$	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -14,14 +14,14 @@ static char * stick_active_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@$$.@@.$$@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$#@@#$$@@@@+",
 "+@@@@$$@@@@$$@@@@+",
 "+@@@@$$@@@@$$@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@@.$$$$.@@@@@+",
+"+@@@@$$#@@#$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index f387fc2777274d593a9b3b641021a7e85ed8c696..4fa75c58ce13434e870e988a17485fb29634aee2 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -3,10 +3,10 @@ static char * stick_pressed_xpm[] = {
 "18 20 6 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #949595 s active_shadow_1",
-"$	c #000000",
+"#	c #949595 s active_color_1",
+"$	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -14,14 +14,14 @@ static char * stick_pressed_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@$$+@@+$$@@@@+",
 "+@@@@$$@@@@$$@@@@+",
 "+@@@@$$@@@@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@@+$$$$+@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 5f4fb3afaccf365ea986d06d40828065006a9c8a..878895f46bae22f743f411e042c10c73488ed474 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -3,10 +3,10 @@ static char * stick_toggled_active_xpm[] = {
 "18 20 6 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
-"@	c #FFFFFF s active_hilight_1",
-"#	c #949595 s active_shadow_1",
-"$	c #000000",
+"+	c #FFFFFF s active_hilight_1",
+"@	c #4B58A2 s active_shadow_1",
+"#	c #949595 s active_color_1",
+"$	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -14,14 +14,14 @@ static char * stick_toggled_active_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@$$.@@.$$@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$#@@#$$@@@@+",
 "+@@@@$$@$$@$$@@@@+",
 "+@@@@$$@$$@$$@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@@.$$$$.@@@@@+",
+"+@@@@$$#@@#$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 7d682a6280f1a2cd1cd56010c6cf121c21109a83..abdf4230370b359076ecce830c419a5bc21e488b 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -3,10 +3,10 @@ static char * stick_toggled_pressed_xpm[] = {
 "18 20 6 1",
 " 	c None",
 ".	c #567B9C s active_mid_1",
-"+	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
-"#	c #949595 s active_shadow_1",
-"$	c #000000",
+"#	c #949595 s active_color_1",
+"$	c #FFFFFF",
 "                  ",
 "                  ",
 " .++++++++++++++. ",
@@ -14,14 +14,14 @@ static char * stick_toggled_pressed_xpm[] = {
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@$$+@@+$$@@@@+",
 "+@@@@$$@$$@$$@@@@+",
 "+@@@@$$@$$@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@@+$$$$+@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 4b5b23431c80f5013c01d1d83bc69ec1a317b0dc..91a5e98aed4826f6afc444f16ae09405b091bd07 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,7 +9,8 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index e9fcedf0a0bdc97a9e19d5401a0eda966b823dc2..168607a8da9b9883860a72f27c66325935efc194 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,7 +9,8 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 4b5b23431c80f5013c01d1d83bc69ec1a317b0dc..91a5e98aed4826f6afc444f16ae09405b091bd07 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,7 +9,8 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index e9fcedf0a0bdc97a9e19d5401a0eda966b823dc2..168607a8da9b9883860a72f27c66325935efc194 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,7 +9,8 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 4b5b23431c80f5013c01d1d83bc69ec1a317b0dc..91a5e98aed4826f6afc444f16ae09405b091bd07 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,7 +9,8 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index e9fcedf0a0bdc97a9e19d5401a0eda966b823dc2..168607a8da9b9883860a72f27c66325935efc194 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,7 +9,8 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 4b5b23431c80f5013c01d1d83bc69ec1a317b0dc..91a5e98aed4826f6afc444f16ae09405b091bd07 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,7 +9,8 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index e9fcedf0a0bdc97a9e19d5401a0eda966b823dc2..168607a8da9b9883860a72f27c66325935efc194 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,7 +9,8 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 4b5b23431c80f5013c01d1d83bc69ec1a317b0dc..91a5e98aed4826f6afc444f16ae09405b091bd07 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,7 +9,8 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index e9fcedf0a0bdc97a9e19d5401a0eda966b823dc2..168607a8da9b9883860a72f27c66325935efc194 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 " 	c None",
 ".	c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,7 +9,8 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "@@@@@@@@",
 "++++++++",
-"++++++++",
+"########",
+"########",
 "########",
 "########",
 "########",
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 5fa3cf8699634046dd435043f710f971b2686fa8..d27ba65e3cb060fad11e2745a47e857038c9df11 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 "       c None",
 ".      c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,8 +9,9 @@ static char * top_left_active_xpm[] = {
 "$	c #4C7BA6 s active_color_1",
 "    @@@@",
 "  @@#+++",
-" @#+++++",
-" @+$$$$$",
+" @#$+$$$",
+" @$$$$$$",
+"@#$$$$$$",
 "@#$$$$$$",
 "@#$$$$$$",
 "@#$$$$$$",
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 78ad42a8bb4143ff00bf32ba17331dadbb7da00a..e7d3d98c3a541ae1bb99562bee5afafc2ff80570 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 "       c None",
 ".      c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,8 +9,9 @@ static char * top_left_inactive_xpm[] = {
 "$	c #4C7BA6 s inactive_color_1",
 "    @@@@",
 "  @@#+++",
-" @#+++++",
-" @+$$$$$",
+" @#$+$$$",
+" @$$$$$$",
+"@#$$$$$$",
 "@#$$$$$$",
 "@#$$$$$$",
 "@#$$$$$$",
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 3fd5d5dee8ac69b12f515634cc1193f89462a522..a15f3aa3a6b6665706f2ff1f2f86369f10d06338 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 "       c None",
 ".      c #000000",
 "+	c #6EA0CD s active_hilight_1",
@@ -9,8 +9,9 @@ static char * top_right_active_xpm[] = {
 "$	c #4C7BA6 s active_color_1",
 "@@@@    ",
 "+++#@@  ",
-"+++++#@ ",
-"$$$$$+@ ",
+"$$$+$#@ ",
+"$$$$$$@ ",
+"$$$$$$#@",
 "$$$$$$#@",
 "$$$$$$#@",
 "$$$$$$#@",
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 427fb7683969007344d9235f76d3307e5b2a4059..9b8629a23390d8cf1fecaf95ff5ac36e37a19f05 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 24 6 1",
+"8 25 6 1",
 "       c None",
 ".      c #000000",
 "+	c #6EA0CD s inactive_hilight_1",
@@ -9,8 +9,9 @@ static char * top_right_inactive_xpm[] = {
 "$	c #4C7BA6 s inactive_color_1",
 "@@@@    ",
 "+++#@@  ",
-"+++++#@ ",
-"$$$$$+@ ",
+"$$$+$#@ ",
+"$$$$$$@ ",
+"$$$$$$#@",
 "$$$$$$#@",
 "$$$$$$#@",
 "$$$$$$#@",