diff --git a/themes/curve/bottom-active.xpm b/themes/curve/bottom-active.xpm
index 54d33fa1defb84191eb7aa789411ca426d443e7b..549003a0582ed982179cd088c6ff826c3ff8b076 100644
--- a/themes/curve/bottom-active.xpm
+++ b/themes/curve/bottom-active.xpm
@@ -7,9 +7,9 @@ static char * bottom_active_xpm[] = {
 "+	c #FFFFFF s active_hilight_2",
 "@	c #E6E6E6 s active_color_2",
 "%      c #A1A1A1 s active_mid_2",
+"................................",
 "++++++++++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
 "................................",
 "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/curve/bottom-inactive.xpm b/themes/curve/bottom-inactive.xpm
index 09c884c65fd4af746ce2147ba696b61f1434674d..db2fb39d20c354f4d4fbb025892ce0cf0541dfa5 100644
--- a/themes/curve/bottom-inactive.xpm
+++ b/themes/curve/bottom-inactive.xpm
@@ -1,15 +1,15 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
 "32 6 6 1",
-" 	c None",
-"$	c #000000",
-".	c #A1A1A1 s inactive_shadow_2",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #E6E6E6 s inactive_color_2",
+"       c None",
+"$      c #000000",
+".      c #A1A1A1 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #E6E6E6 s inactive_color_2",
 "%      c #A1A1A1 s inactive_mid_2",
+"................................",
 "++++++++++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
 "................................",
 "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/curve/bottom-left-active.xpm b/themes/curve/bottom-left-active.xpm
index ac1c45340b4fe78c1a503b14993a71eaef21078e..5f4f554c15d85d3057f4d40d98d03c6825f6a5d0 100644
--- a/themes/curve/bottom-left-active.xpm
+++ b/themes/curve/bottom-left-active.xpm
@@ -23,8 +23,8 @@ static char * bottom_left_active_xpm[] = {
 ".#++%@                ",
 ".#++%@                ",
 ".#++%@                ",
-".#+++%################",
-" .#+++++++++++++++++++",
+".#+++@@@@@@@@@@@@@@@@@",
+" .#+++################",
 " .#%%+++++++++++++++++",
 "  .@@%%%%%%%%%%%%%%%%%",
 "   ..@@@@@@@@@@@@@@@@@",
diff --git a/themes/curve/bottom-left-inactive.xpm b/themes/curve/bottom-left-inactive.xpm
index 0896a18bc9a7ff5fb4e73d768726fddcf2506de1..49076e1e12385259c2e118873091ca6a6d2b3135 100644
--- a/themes/curve/bottom-left-inactive.xpm
+++ b/themes/curve/bottom-left-inactive.xpm
@@ -23,8 +23,8 @@ static char * bottom_left_inactive_xpm[] = {
 ".#++%@                ",
 ".#++%@                ",
 ".#++%@                ",
-".#+++%################",
-" .#+++++++++++++++++++",
+".#+++@@@@@@@@@@@@@@@@@",
+" .#+++################",
 " .#%%+++++++++++++++++",
 "  .@@%%%%%%%%%%%%%%%%%",
 "   ..@@@@@@@@@@@@@@@@@",
diff --git a/themes/curve/bottom-right-active.xpm b/themes/curve/bottom-right-active.xpm
index 0eb7afde809cb477bfc43c70a29bd7a1b32af76e..81f6e9bf14e2154f24b25d898071c0a766f929fc 100644
--- a/themes/curve/bottom-right-active.xpm
+++ b/themes/curve/bottom-right-active.xpm
@@ -7,24 +7,24 @@ static char * bottom_right_active_xpm[] = {
 "@      c #000000",
 "#      c #8D95C6 s active_hilight_1",
 "%      c #A1A1A1 s active_mid_1",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"################+++%.@",
-"++++++++++++++++++%.@ ",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+".................#+%.@",
+"#################+%.@ ",
 "+++++++++++++++++%%.@ ",
 "%%%%%%%%%%%%%%%%%..@  ",
 ".................@@   ",
diff --git a/themes/curve/bottom-right-inactive.xpm b/themes/curve/bottom-right-inactive.xpm
index 975b95fdace3f75a1552f23d7c62d6ba717a2821..5b983dd1d7d3e7856c4f8f6cb2758c5320a8e51a 100644
--- a/themes/curve/bottom-right-inactive.xpm
+++ b/themes/curve/bottom-right-inactive.xpm
@@ -7,24 +7,24 @@ static char * bottom_right_inactive_xpm[] = {
 "@      c #000000",
 "#      c #8D95C6 s inactive_hilight_1",
 "%      c #A1A1A1 s inactive_mid_1",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"                #++%.@",
-"################+++%.@",
-"++++++++++++++++++%.@ ",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+"                .#+%.@",
+".................#+%.@",
+"#################+%.@ ",
 "+++++++++++++++++%%.@ ",
 "%%%%%%%%%%%%%%%%%..@  ",
 ".................@@   ",
diff --git a/themes/curve/close-active.xpm b/themes/curve/close-active.xpm
index bd9e8e7da249876bd3f6c1db03253201a0c7b58b..4022315e6c7520044b24424f8e6e2fc7ef9075d4 100644
--- a/themes/curve/close-active.xpm
+++ b/themes/curve/close-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "$	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+#####$$####$$#####@",
-"+####$$$$##$$$$####@",
-"+####$$$$$$$$$$####@",
-"+#####$$$$$$$$#####@",
-"+######$$$$$$######@",
-"+######$$$$$$######@",
-"+#####$$$$$$$$#####@",
-"+####$$$$$$$$$$####@",
-"+####$$$$##$$$$####@",
-"+#####$$####$$#####@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+#####$$####$$#####=",
+"+####$$$$##$$$$####=",
+"+####$$$$$$$$$$####=",
+"+#####$$$$$$$$#####=",
+"+######$$$$$$######=",
+"+######$$$$$$######=",
+"+#####$$$$$$$$#####=",
+"+####$$$$$$$$$$####=",
+"+####$$$$##$$$$####=",
+"+#####$$####$$#####=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/hide-active.xpm b/themes/curve/hide-active.xpm
index 649e846d1dcaf8db9ce366e6f1b8527a7eb0226b..28717a4e70030fd23de58d0253ee31fd7861d2c0 100644
--- a/themes/curve/hide-active.xpm
+++ b/themes/curve/hide-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "$	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+####@$$$$$$$$@####@",
-"+####$$$$$$$$$$####@",
-"+####$$$$$$$$$$####@",
-"+####@$$$$$$$$@####@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+####@$$$$$$$$@####=",
+"+####$$$$$$$$$$####=",
+"+####$$$$$$$$$$####=",
+"+####@$$$$$$$$@####=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/maximize-active.xpm b/themes/curve/maximize-active.xpm
index 9327b294f4366d1e1fce0fa590e20cf7696d559c..99a8e9ebc82e1546e767fe96e7dc5e808b1a01f7 100644
--- a/themes/curve/maximize-active.xpm
+++ b/themes/curve/maximize-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "%	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+####@%%%%%%%%@####@",
-"+####%%%%%%%%%%####@",
-"+####%%%%%%%%%%####@",
-"+####%%%%%%%%%%####@",
-"+####%########%####@",
-"+####%########%####@",
-"+####%########%####@",
-"+####%########%####@",
-"+####%########%####@",
-"+####@%%%%%%%%@####@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+####@%%%%%%%%@####=",
+"+####%%%%%%%%%%####=",
+"+####%%%%%%%%%%####=",
+"+####%%%%%%%%%%####=",
+"+####%########%####=",
+"+####%########%####=",
+"+####%########%####=",
+"+####%########%####=",
+"+####%########%####=",
+"+####@%%%%%%%%@####=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/menu-active.xpm b/themes/curve/menu-active.xpm
index 11df05b9bca2d76b8a172bce52cf7833b3c66352..d2f9f999eea8ab7df9a9f9c8ae6524fda6dc6dbb 100644
--- a/themes/curve/menu-active.xpm
+++ b/themes/curve/menu-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "$	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+####$$######$$####@",
-"+###$$$$####$$$$###@",
-"+###$$$$$##$$$$$###@",
-"+####$$$$$$$$$$####@",
-"+#####$$$$$$$$#####@",
-"+######$$$$$$######@",
-"+#######$$$$#######@",
-"+########$$########@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+####$$######$$####=",
+"+###$$$$####$$$$###=",
+"+###$$$$$##$$$$$###=",
+"+####$$$$$$$$$$####=",
+"+#####$$$$$$$$#####=",
+"+######$$$$$$######=",
+"+#######$$$$#######=",
+"+########$$########=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/right-active.xpm b/themes/curve/right-active.xpm
index 5b12fea7e4966e7ea94cdf53dca2a7d3bf4949b8..4237f63528a211fd2298f6253a8f633cf519d986 100644
--- a/themes/curve/right-active.xpm
+++ b/themes/curve/right-active.xpm
@@ -7,35 +7,35 @@ static char * right_active_xpm[] = {
 "#	c #B8B8B8 s active_shadow_2",
 "%	c #A1A1A1 s active_mid_2",
 "$	c #000000",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$"};
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$"};
diff --git a/themes/curve/right-inactive.xpm b/themes/curve/right-inactive.xpm
index 05a72ba7414c886592e144e75d37773c8f51e1c7..1df1c31176a226ee2602cc0e8cfdb857c95b3951 100644
--- a/themes/curve/right-inactive.xpm
+++ b/themes/curve/right-inactive.xpm
@@ -7,35 +7,35 @@ static char * right_inactive_xpm[] = {
 "#	c #B8B8B8 s inactive_shadow_2",
 "%	c #A1A1A1 s inactive_mid_2",
 "$	c #000000",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$",
-"+@@%#$"};
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$",
+"#+@%#$"};
diff --git a/themes/curve/shade-active.xpm b/themes/curve/shade-active.xpm
index c392bf7711ca3d2a64da9c3d461bc1a2449005a8..8aabd230ae51e2a55d4717161239bbd3a51131ed 100644
--- a/themes/curve/shade-active.xpm
+++ b/themes/curve/shade-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "$	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+########$$########@",
-"+#######$$$$#######@",
-"+######$$$$$$######@",
-"+#####$$$$$$$$#####@",
-"+####$$$$$$$$$$####@",
-"+###$$$$$##$$$$$###@",
-"+###$$$$####$$$$###@",
-"+####$$######$$####@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+########$$########=",
+"+#######$$$$#######=",
+"+######$$$$$$######=",
+"+#####$$$$$$$$#####=",
+"+####$$$$$$$$$$####=",
+"+###$$$$$##$$$$$###=",
+"+###$$$$####$$$$###=",
+"+####$$######$$####=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/stick-active.xpm b/themes/curve/stick-active.xpm
index c9fb47c8c09d5a2256673f270848ef1b70a4b3d2..ba075dbe8b18457411406934f26cf5b67c4581f8 100644
--- a/themes/curve/stick-active.xpm
+++ b/themes/curve/stick-active.xpm
@@ -1,28 +1,29 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"20 19 6 1",
+"20 19 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
 "@	c #919191 s active_shadow_2",
 "#	c #E6E6E6 s active_color_2",
+"=	c #A1A1A1 s active_mid_2",
 "$	c #474747",
 "....................",
-"+++++++++++++++++++@",
-"++#################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##########$###$###@",
-"+##########$$$$$###@",
-"+####$$$$$$$###$###@",
-"+###$$$$$$$$$$$$###@",
-"+####$$$$$$$$$$$###@",
-"+##########$$$$$###@",
-"+##########$###$###@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
-"+##################@",
+"+++++++++++++++++++=",
+"++#################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##########$###$###=",
+"+##########$$$$$###=",
+"+####$$$$$$$###$###=",
+"+###$$$$$$$$$$$$###=",
+"+####$$$$$$$$$$$###=",
+"+##########$$$$$###=",
+"+##########$###$###=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
+"+##################=",
 "@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/curve/top-left-active.xpm b/themes/curve/top-left-active.xpm
index 021e603c7c5d1affb797eb86e7f45d2700345202..302fa231d79669bca4c9a22145c0709f78b0e9f6 100644
--- a/themes/curve/top-left-active.xpm
+++ b/themes/curve/top-left-active.xpm
@@ -1,29 +1,28 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"6 20 6 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF s active_hilight_2",
-"@	c #919191 s active_shadow_2",
-"#	c #E6E6E6 s active_color_2",
-"%	c #A1A1A1 s active_mid_2",
+"6 19 6 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #919191 s active_shadow_2",
+"#      c #E6E6E6 s active_color_2",
+"%      c #A1A1A1 s active_mid_2",
 "     .",
 "   ..+",
-"  .++@",
-" .+#%@",
-" .+#%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".+##%@",
-".@@@@@",
-".+++%@};
+"  .++%",
+" .+##%",
+" .+##%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".+###%",
+".@@@@@"};
diff --git a/themes/curve/top-left-inactive.xpm b/themes/curve/top-left-inactive.xpm
index f8316810fefc2a31896cc180a2f467870eba1bc4..0f98e88f5df83a77da41bc57c643d9f8ac23d6ec 100644
--- a/themes/curve/top-left-inactive.xpm
+++ b/themes/curve/top-left-inactive.xpm
@@ -1,14 +1,11 @@
 /* XPM */
 static char * top_left_ininactive_xpm[] = {
-"6 20 8 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #919191 s inactive_shadow_1",
-"#	c #E6E6E6 s inactive_color_1",
-"&      c #A1A1A1 s inactive_mid_2"
-"*      c #919191 s inactive_shadow_2"
-"=      c #FFFFFF s inactive_hilight_2", 
+"6 19 5 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_1",
+"@      c #919191 s inactive_shadow_1",
+"#      c #E6E6E6 s inactive_color_1",
 "     .",
 "   ..+",
 "  .++#",
@@ -27,5 +24,4 @@ static char * top_left_ininactive_xpm[] = {
 ".+####",
 ".+####",
 ".+####",
-".@@@@@",
-".===&*"};
+".@@@@@"};
diff --git a/themes/curve/top-right-active.xpm b/themes/curve/top-right-active.xpm
index 1e23b7a78a1e3bb3bc572e821a5f64ec19735150..da363463a2612f03392524e82a8d481dcc614e6f 100644
--- a/themes/curve/top-right-active.xpm
+++ b/themes/curve/top-right-active.xpm
@@ -1,12 +1,12 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"6 20 6 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF s active_hilight_2",
-"#	c #E6E6E6 s active_color_2",
-"$	c #919191 s active_shadow_2",
-"%	c #A1A1A1 s active_mid_2",
+"6 19 6 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s active_hilight_2",
+"#      c #E6E6E6 s active_color_2",
+"$      c #919191 s active_shadow_2",
+"%      c #A1A1A1 s active_mid_2",
 ".     ",
 "+..   ",
 "+++.  ",
@@ -25,5 +25,4 @@ static char * top_right_active_xpm[] = {
 "+##%$.",
 "+##%$.",
 "+##%$.",
-"$$$$$.",
-"+++%$."};
+"$$$$$."};
diff --git a/themes/curve/top-right-inactive.xpm b/themes/curve/top-right-inactive.xpm
index 8aa18cb9bc41620204ef7a1ffa96577ada94dc9a..1379b1a980293d457fa5e58c3c2c6692ec8812f0 100644
--- a/themes/curve/top-right-inactive.xpm
+++ b/themes/curve/top-right-inactive.xpm
@@ -1,15 +1,12 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"6 20 9 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF s inactive_hilight_1",
-"#	c #E6E6E6 s inactive_color_1",
-"$	c #919191 s inactive_shadow_1",
-"%	c #A1A1A1 s inactive_mid_1",
-"&      c #A1A1A1 s inactive_mid_2"
-"*      c #A1A1A1 s inactive_shadow_2"
-"=      c #FFFFFF s inactive_hilight_2", 
+"6 19 6 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_1",
+"#      c #E6E6E6 s inactive_color_1",
+"$      c #919191 s inactive_shadow_1",
+"%      c #A1A1A1 s inactive_mid_1",
 ".     ",
 "+..   ",
 "#++.  ",
@@ -28,5 +25,4 @@ static char * top_right_inactive_xpm[] = {
 "###%$.",
 "###%$.",
 "###%$.",
-"$$$$$.",
-"===&*."};
+"$$$$$."};