diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index a16d8578ec35f4447c270603599146858ac413b4..9013d62a0a055a6ab7a01c2360d9bdbaf227b528 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,14 +1,11 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"32 5 6 1",
+"32 3 5 1",
 "       c None",
-".      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 #949594 s active_shadow_1",
+"+      c #6EA0CD s active_hilight_1",
+"#      c #567B9C s active_mid_1",
 "$      c #000000",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "################################",
 "................................",
 "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 485650bc07e22249055a2556af6ae284d708f987..89697d8c422c73e7ca51792672274e87adb5b3b8 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,14 +1,11 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"32 5 6 1",
+"32 3 5 1",
 "       c None",
-".      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 #949594 s inactive_shadow_1",
+"+      c #6EA0CD s inactive_hilight_1",
+"#      c #567B9C s inactive_mid_1",
 "$      c #000000",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "################################",
 "................................",
 "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index f7b627fbc7f22199721b60ce891c8079e21c2edc..c93e03ee4e5423aafebe56eadaa41ec78071ca6e 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -3,23 +3,23 @@ static char * bottom_left_active_xpm[] = {
 "16 16 6 1",
 "       c None",
 "@      c #000000",
-".      c #4B58A2 s active_shadow_2",
-"+      c #525FAB s active_color_2",
-"#      c #FFFFFF s active_hilight_2",
-"$      c #848FD6 s active_mid_2",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$+++++++++++++",
-" @$$++++++++++++",
-" @.$$$$$$$$$$$$$",
-"  @@............",
-"    @@@@@@@@@@@@"};
+".      c #4B58A2 s active_shadow_1",
+"#      c #6EA0CD s active_hilight_1",
+"*      c #4C7BA6 s active_color_1",
+"$      c #567B9C s active_mid_1",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*$$$$$$$$$$$$$",
+"@$..............",
+" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 2d26b4f5d68d9b1ae1ff34351809dcb1261c8060..20eb32ae96c3b68923d46831bde888e5c820f787 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -3,23 +3,23 @@ static char * bottom_left_inactive_xpm[] = {
 "16 16 6 1",
 "       c None",
 "@      c #000000",
-".      c #4B58A2 s inactive_shadow_2",
-"+      c #525FAB s inactive_color_2",
-"#      c #FFFFFF s inactive_hilight_2",
-"$      c #848FD6 s inactive_mid_2",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$++           ",
-"@.$+++++++++++++",
-" @$$++++++++++++",
-" @.$$$$$$$$$$$$$",
-"  @@............",
-"    @@@@@@@@@@@@"};
+".      c #4B58A2 s inactive_shadow_1",
+"#      c #6EA0CD s inactive_hilight_1",
+"*      c #4C7BA6 s inactive_color_1",
+"$      c #567B9C s inactive_mid_1",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*             ",
+"@#*$$$$$$$$$$$$$",
+"@$..............",
+" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index faca11bc4a7b329170531d5c8419028836d50bbe..b5735c406c906e32078bb80d29fc687eee5a4edc 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_right_active_xpm[] = {
-"16 16 6 1",
+"16 16 5 1",
 "       c None",
 "@      c #000000",
-".      c #4B58A2 s active_shadow_2",
-"+      c #525FAB s active_color_2",
-"#      c #FFFFFF s active_hilight_2",
-"$      c #848FD6 s active_mid_2",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"+++++++++++++$.@",
-"++++++++++++$$@ ",
-"$$$$$$$$$$$$$.@ ",
-"............@@  ",
-"@@@@@@@@@@@@    "};
+".      c #4B58A2 s active_shadow_1",
+"#      c #6EA0CD s active_hilight_1",
+"$      c #567B9C s active_mid_1",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"$$$$$$$$$$$$$$.@",
+"...............@",
+"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 06211314d586599bc626389e0923b5b6ef9c1be6..de7e050a95a02a763c126671e210f72ce8171df2 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_right_inactive_xpm[] = {
-"16 16 6 1",
+"16 16 5 1",
 "       c None",
 "@      c #000000",
-".      c #4B58A2 s inactive_shadow_2",
-"+      c #525FAB s inactive_color_2",
-"#      c #FFFFFF s inactive_hilight_2",
-"$      c #848FD6 s inactive_mid_2",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"           ++$.@",
-"+++++++++++++$.@",
-"++++++++++++$$@ ",
-"$$$$$$$$$$$$$.@ ",
-"............@@  ",
-"@@@@@@@@@@@@    "};
+".      c #4B58A2 s inactive_shadow_1",
+"#      c #6EA0CD s inactive_hilight_1",
+"$      c #567B9C s inactive_mid_1",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"             $.@",
+"$$$$$$$$$$$$$$.@",
+"...............@",
+"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 3d9d6b6e54add02c2d3af05dc563940a0be7d158..2669e2a3622bdaabdd37d349845a0b0c009a3fc4 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"5 32 6 1",
+"3 32 4 1",
 "       c None",
-".      c #949595 s active_shadow_2",
-"+      c #FFFFFF s active_hilight_2",
-"#      c #D5D6D5 s active_color_2",
-"*      c #B4BAB5 s active_mid_2",
+".      c #6EA0CD s active_hilight_1",
+"*      c #4C7BA6 s active_color_1",
 "@      c #000000",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##"};
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index f1a2121eed8b61160faff155e0b6c90ff0c29b7c..84b3748df198317fc9fb62badb47543f08995581 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"5 32 6 1",
+"3 32 4 1",
 "       c None",
-".      c #949595 s inactive_shadow_2",
-"+      c #FFFFFF s inactive_hilight_2",
-"#      c #D5D6D5 s inactive_color_2",
-"*      c #B4BAB5 s inactive_mid_2",
+".      c #6EA0CD s inactive_hilight_1",
+"*      c #4C7BA6 s inactive_color_1",
 "@      c #000000",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
-"@.*##",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
+"@.*",
 "@.*##"};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 1591ecc44312b9de20232b691779fd25fe1384ad..bb4256b02c337143bd1e1762df80f35a040f144f 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"5 32 6 1",
+"3 32 4 1",
 "       c None",
-".      c #949595 s active_shadow_2",
-"+      c #FFFFFF s active_hilight_2",
-"#      c #D5D6D5 s active_color_2",
-"*      c #B4BAB5 s active_mid_2",
+".      c #3E566B s active_shadow_1",
+"*      c #567B9C s active_mid_1",
 "@      c #000000",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@"};
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@"};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index e8e2ffb80292a28cbdc90d2ac19a0410bc3f48a5..ce98f90b869941b833a4487acda85a46a935e87e 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"5 32 6 1",
+"3 32 4 1",
 "       c None",
-".      c #949595 s inactive_shadow_2",
-"+      c #FFFFFF s inactive_hilight_2",
-"#      c #D5D6D5 s inactive_color_2",
-"*      c #B4BAB5 s inactive_mid_2",
+".      c #3E566B s inactive_shadow_1",
+"*      c #567B9C s inactive_mid_1",
 "@      c #000000",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@",
-"##*.@"};
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@",
+"*.@"};
diff --git a/themes/default/themerc b/themes/default/themerc
index d917dc223f3777ce83081806045e49dce49d00e2..195c07ae787ecfc2886c821574758fb461b8aef3 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
-button_offset=0
-button_spacing=1
+button_offset=2
+button_spacing=2
 full_width_title=true
 title_horizontal_offset=0
 title_vertical_offset_active=2
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 5bcfb7604b561701d7954561e81298f7c5d83a7e..8ebdb3470a44085b1f0d7c85b32635e43c4ad7c5 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -8,6 +8,7 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_active_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 103ea0f2da58025fb85af66ca5fde766fd40b7cb..52320b9619aa184e0cfca49a362f83b0faaec958 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -8,6 +8,7 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_inactive_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 5bcfb7604b561701d7954561e81298f7c5d83a7e..8ebdb3470a44085b1f0d7c85b32635e43c4ad7c5 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -8,6 +8,7 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_active_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 103ea0f2da58025fb85af66ca5fde766fd40b7cb..52320b9619aa184e0cfca49a362f83b0faaec958 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -8,6 +8,7 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_inactive_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 5bcfb7604b561701d7954561e81298f7c5d83a7e..8ebdb3470a44085b1f0d7c85b32635e43c4ad7c5 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -8,6 +8,7 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_active_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 103ea0f2da58025fb85af66ca5fde766fd40b7cb..52320b9619aa184e0cfca49a362f83b0faaec958 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -8,6 +8,7 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_inactive_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 5bcfb7604b561701d7954561e81298f7c5d83a7e..8ebdb3470a44085b1f0d7c85b32635e43c4ad7c5 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -8,6 +8,7 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_active_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 103ea0f2da58025fb85af66ca5fde766fd40b7cb..52320b9619aa184e0cfca49a362f83b0faaec958 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -8,6 +8,7 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_inactive_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 5bcfb7604b561701d7954561e81298f7c5d83a7e..8ebdb3470a44085b1f0d7c85b32635e43c4ad7c5 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -8,6 +8,7 @@ static char * title_active_xpm[] = {
 "#	c #4C7BA6 s active_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_active_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 103ea0f2da58025fb85af66ca5fde766fd40b7cb..52320b9619aa184e0cfca49a362f83b0faaec958 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -8,6 +8,7 @@ static char * title_inactive_xpm[] = {
 "#	c #4C7BA6 s inactive_color_1",
 "........",
 "++++++++",
+"++++++++",
 "########",
 "########",
 "########",
@@ -27,5 +28,4 @@ static char * title_inactive_xpm[] = {
 "########",
 "########",
 "########",
-"########",
-"@@@@@@@@"};
+"########"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 268fc7e03b679b5a3e343621024c4baa0448e311..b360739fd148800f5c116dda4493fb45d52cf452 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -9,24 +9,24 @@ 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 74169715139c0968c9a76ceeafa1afa85ab9def0..adb2d2c2cce856714f6f5a195f90ec2f86d4c77b 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -9,24 +9,24 @@ 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 a463f279ee02ceeead925e68f924409715d8a66e..b9712decab76fd74a19bab8231a333f201946bb1 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -9,7 +9,7 @@ static char * top_right_active_xpm[] = {
 "$	c #4C7BA6 s active_color_1",
 "....    ",
 "+++$..  ",
-"$$$+$@. ",
+"++++$@. ",
 "$$$$+$. ",
 "$$$$$#@.",
 "$$$$$#@.",
@@ -29,4 +29,4 @@ static char * top_right_active_xpm[] = {
 "$$$$$#@.",
 "$$$$$#@.",
 "$$$$$#@.",
-"@@@@@@@."};
+"$$$$$#@."};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 736ad55f429dc4cfc0815909c6394ae970c46c6e..8ebe70bd5271ff35e6a3a27ea6eacca452bb7119 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -9,7 +9,7 @@ static char * top_right_inactive_xpm[] = {
 "$	c #4C7BA6 s inactive_color_1",
 "....    ",
 "+++$..  ",
-"$$$+$@. ",
+"++++$@. ",
 "$$$$+$. ",
 "$$$$$#@.",
 "$$$$$#@.",
@@ -29,4 +29,4 @@ static char * top_right_inactive_xpm[] = {
 "$$$$$#@.",
 "$$$$$#@.",
 "$$$$$#@.",
-"@@@@@@@."};
+"$$$$$#@."};