diff --git a/themes/default/README b/themes/default/README
index c7a91c985ba9e237a843b82377a7ec5b4a4ee292..761ee47b6927cc2f9e4efcfbd15e6adfbbbcde87 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,4 +1,4 @@
-default
+Default
 -------
 
-default theme for xfwm4
+Default xfwm4 theme
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index c9c0703a26db39f21f532317ceec73a67b8648fa..9335e7d2469bde3b5709d19c216001a31b838f75 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -3,11 +3,11 @@ static char * bottom_active_xpm[] = {
 "32 4 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s active_hilight_2",
-"@	c #3E566B s active_shadow_2",
-"$	c #567B9C s active_mid_2",
-"#	c #4C7BA6 s active_color_2",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #D5D6D5 s active_color_1",
+"%	c #567B9C s active_mid_1",
 "################################",
-"################################",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "................................"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 20a7a9ab69a6614014d516400aa408ff919a4142..629719a4a5e19f743c4b609461a4aba9fc4f739d 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -3,11 +3,11 @@ static char * bottom_inactive_xpm[] = {
 "32 4 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s inactive_hilight_2",
-"@	c #3E566B s inactive_shadow_2",
-"$	c #567B9C s inactive_mid_2",
-"#	c #4C7BA6 s inactive_color_2",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #D5D6D5 s inactive_color_1",
+"%	c #567B9C s inactive_mid_1",
 "################################",
-"################################",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "................................"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 309a8b142e12f4e8c698b0af776b09217aa6db02..f1eab8372bbbaf92e05f9d6bc1297d6a1d439273 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -1,25 +1,25 @@
 /* XPM */
 static char * bottom_left_active_xpm[] = {
 "16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #6EA0CD s active_hilight_2",
-"@	c #3E566B s active_shadow_2",
-"$	c #567B9C s active_mid_2",
-"#	c #4C7BA6 s active_color_2",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##############",
-".$##############",
-".@$$$$$$$$$$$$$$",
-"................"};
+"       c None",
+".      c #000000",
+"+      c #6EA0CD s active_hilight_1",
+"@      c #3E566B s active_shadow_1",
+"#	c #D5D6D5 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 c7177e5ddfb60325b5ccb894918867032900571d..89a12aebb98e33300f3b269b4581c81f121f5315 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -1,25 +1,25 @@
 /* XPM */
 static char * bottom_left_inactive_xpm[] = {
 "16 16 6 1",
-" 	c None",
-".	c #000000",
-"+	c #6EA0CD s inactive_hilight_2",
-"@	c #3E566B s inactive_shadow_2",
-"$	c #567B9C s inactive_mid_2",
-"#	c #4C7BA6 s inactive_color_2",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##            ",
-".$##############",
-".$##############",
-".@$$$$$$$$$$$$$$",
-"................"};
+"       c None",
+".      c #000000",
+"+      c #6EA0CD s inactive_hilight_1",
+"@      c #3E566B s inactive_shadow_1",
+"#	c #D5D6D5 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 bd361ac5581c20a56d212e840e32013f3aec2cbb..5afcf425d88a18302ab108f63b27d46b30667837 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -3,23 +3,23 @@ static char * bottom_right_active_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s active_hilight_2",
-"@	c #3E566B s active_shadow_2",
-"$	c #567B9C s active_mid_2",
-"#	c #4C7BA6 s active_color_2",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"##############$.",
-"##############$.",
-"$$$$$$$$$$$$$$@.",
-"................"};
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #D5D6D5 s active_color_1",
+"%	c #567B9C s active_mid_1",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"############%%@.",
+"%%%%%%%%%%%%%@@.",
+"@@@@@@@@@@@@@@@.",
+"............... "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 25642c77aa2dea4ebb4000732aa61345596c4d27..3be4cad211cfedf4c3a9473923a5f8d49164af99 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -3,23 +3,23 @@ static char * bottom_right_inactive_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s inactive_hilight_2",
-"@	c #3E566B s inactive_shadow_2",
-"$	c #567B9C s inactive_mid_2",
-"#	c #4C7BA6 s inactive_color_2",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"            ##$.",
-"##############$.",
-"##############$.",
-"$$$$$$$$$$$$$$@.",
-"................"};
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #D5D6D5 s inactive_color_1",
+"%	c #567B9C s inactive_mid_1",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"            #%@.",
+"############%%@.",
+"%%%%%%%%%%%%%@@.",
+"@@@@@@@@@@@@@@@.",
+"............... "};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 33600d117a873b1cac1ce466affc24dc934dffec..fefe7df604f9df6898e46ba935ff95b0601673f5 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -3,39 +3,39 @@ static char * left_active_xpm[] = {
 "4 32 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s active_hilight_2",
-"@	c #3E566B s active_shadow_2",
-"$	c #567B9C s active_mid_2",
-"#	c #4C7BA6 s active_color_2",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##"};
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #D5D6D5 s active_color_1",
+"%	c #567B9C s active_mid_1",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index 8002a6042856da4308f7695c327aa6bc15266677..dc918d41c20618a7ffad0ab94a1830ca14195ec1 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -3,39 +3,39 @@ static char * left_inactive_xpm[] = {
 "4 32 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s inactive_hilight_2",
-"@	c #3E566B s inactive_shadow_2",
-"$	c #567B9C s inactive_mid_2",
-"#	c #4C7BA6 s inactive_color_2",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##",
-".$##"};
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #D5D6D5 s inactive_color_1",
+"%	c #567B9C s inactive_mid_1",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#",
+".@%#"};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index dcb7206c133c034293295d1941c64f7ff974783d..73d0030998c37e9b2856101d656b3247ce756cb8 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -3,39 +3,39 @@ static char * right_active_xpm[] = {
 "4 32 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s active_hilight_2",
-"@	c #3E566B s active_shadow_2",
-"$	c #567B9C s active_mid_2",
-"#	c #4C7BA6 s active_color_2",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$."};
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #D5D6D5 s active_color_1",
+"%	c #567B9C s active_mid_1",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@."};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 80736e3ffe5d6a55e1169458c5f44a8ca4e31098..21d751880fbbec345860b26838caf2db079a67b1 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -3,39 +3,39 @@ static char * right_inactive_xpm[] = {
 "4 32 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #6EA0CD s inactive_hilight_2",
-"@	c #3E566B s inactive_shadow_2",
-"$	c #567B9C s inactive_mid_2",
-"#	c #4C7BA6 s inactive_color_2",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$.",
-"##$."};
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #D5D6D5 s inactive_color_1",
+"%	c #567B9C s inactive_mid_1",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@.",
+"#%@."};
diff --git a/themes/default/themerc b/themes/default/themerc
index 89b61f7dab5a8c0f90c44511a43937053653f10d..194c14ebfe8e9d3270196a030c90badeecfe9881 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,8 +1,10 @@
+#active_text_color=#FFFFFF
 button_offset=1
-button_spacing=1
+button_spacing=2
 full_width_title=true
 title_horizontal_offset=0
 title_vertical_offset_active=3
 title_vertical_offset_inactive=3
+#title_shadow_active=true
 title_shadow_active=false
 title_shadow_inactive=false
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 7b02e80c75a2b05454ff18b9a5858999c129dfd4..80933838bd7f7d8e0e0ea43beb8c66870a8e2ffe 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -9,7 +9,7 @@ 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 a0e8cf5446473141f6aab434683f8b8f9cca2a27..51e8f0911110330b2aaa3aabe672881ffebc93de 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -9,7 +9,7 @@ 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 7b02e80c75a2b05454ff18b9a5858999c129dfd4..80933838bd7f7d8e0e0ea43beb8c66870a8e2ffe 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -9,7 +9,7 @@ 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 a0e8cf5446473141f6aab434683f8b8f9cca2a27..51e8f0911110330b2aaa3aabe672881ffebc93de 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -9,7 +9,7 @@ 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 7b02e80c75a2b05454ff18b9a5858999c129dfd4..80933838bd7f7d8e0e0ea43beb8c66870a8e2ffe 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -9,7 +9,7 @@ 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 a0e8cf5446473141f6aab434683f8b8f9cca2a27..51e8f0911110330b2aaa3aabe672881ffebc93de 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -9,7 +9,7 @@ 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 7b02e80c75a2b05454ff18b9a5858999c129dfd4..80933838bd7f7d8e0e0ea43beb8c66870a8e2ffe 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -9,7 +9,7 @@ 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 a0e8cf5446473141f6aab434683f8b8f9cca2a27..51e8f0911110330b2aaa3aabe672881ffebc93de 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -9,7 +9,7 @@ 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 7b02e80c75a2b05454ff18b9a5858999c129dfd4..80933838bd7f7d8e0e0ea43beb8c66870a8e2ffe 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -9,7 +9,7 @@ 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 a0e8cf5446473141f6aab434683f8b8f9cca2a27..51e8f0911110330b2aaa3aabe672881ffebc93de 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -9,7 +9,7 @@ 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 70e1f24d28014192dbe6037c981b6df9b24daf18..c6c077e688ce96cab658a0f58bc779d5ebb9ab4c 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -8,28 +8,26 @@ static char * top_left_active_xpm[] = {
 "#	c #567B9C s active_mid_1",
 "$	c #4C7BA6 s active_color_1",
 "    ....",
-"  ..@#++",
-" .@#$$$$",
-" .#$$$$$",
-".@$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$"};
+"  ..#+++",
+" .@#++++",
+" .#+$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 8338d39f800bc70b96b6f851a1da03eedcbbc0d7..6f80e2162d5bda81064e465f8f9111b438c8aa80 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -8,28 +8,26 @@ static char * top_left_inactive_xpm[] = {
 "#	c #567B9C s inactive_mid_1",
 "$	c #4C7BA6 s inactive_color_1",
 "    ....",
-"  ..@#++",
-" .@#$$$$",
-" .#$$$$$",
-".@$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$",
-".#$$$$$$"};
+"  ..#+++",
+" .@#++++",
+" .#+$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$",
+".@#$$$$$"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index dd84087006f71ebdcfc924b16cf13abef6e0cc9b..223234a9daebf7b6e836f7cbc3a5e6fd168ee9c2 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -8,28 +8,26 @@ static char * top_right_active_xpm[] = {
 "#	c #567B9C s active_mid_1",
 "$	c #4C7BA6 s active_color_1",
 "....    ",
-"++#@..  ",
-"$$$$#@. ",
-"$$$$$#. ",
-"$$$$$$@.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#."};
+"+++#..  ",
+"++++#@. ",
+"$$$$+#. ",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@."};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 47de55646632317199e4a2626ee472294a5c5eae..4b10aac75efab2e6fcd06957d6b868109de706d2 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -8,28 +8,26 @@ static char * top_right_inactive_xpm[] = {
 "#	c #567B9C s inactive_mid_1",
 "$	c #4C7BA6 s inactive_color_1",
 "....    ",
-"++#@..  ",
-"$$$$#@. ",
-"$$$$$#. ",
-"$$$$$$@.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#.",
-"$$$$$$#."};
+"+++#..  ",
+"++++#@. ",
+"$$$$+#. ",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@.",
+"$$$$$#@."};