diff --git a/themes/microcurve/bottom-active.xpm b/themes/microcurve/bottom-active.xpm
index beee0e215072be326aa8880021091859e100fa0f..31e0a4785c9d2855c85425ef7dfd4e9a85aee9b3 100644
--- a/themes/microcurve/bottom-active.xpm
+++ b/themes/microcurve/bottom-active.xpm
@@ -6,7 +6,7 @@ static char * bottom_active_xpm[] = {
 "+	c #D6D6CC s active_color_2",
 "#      c #FFFFFF s active_hilight_2",
 "@	c #000000",
-"................................",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "################################",
 "................................",
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/microcurve/bottom-inactive.xpm b/themes/microcurve/bottom-inactive.xpm
index 7453abe7b258fde7f7c52cfd927cd829fbe52420..71c3e0aa5b8efa2788f06f10798ee176b17bd47e 100644
--- a/themes/microcurve/bottom-inactive.xpm
+++ b/themes/microcurve/bottom-inactive.xpm
@@ -6,7 +6,7 @@ static char * bottom_inactive_xpm[] = {
 "+	c #D6D6CC s inactive_color_2",
 "#      c #FFFFFF s inactive_hilight_2",
 "@	c #000000",
-"................................",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "################################",
 "................................",
 "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/microcurve/bottom-left-active.xpm b/themes/microcurve/bottom-left-active.xpm
index 98381d6ce4f82fc738ca4ae551eba290d7d34437..f48596727631233536a421e68610c128d0556f72 100644
--- a/themes/microcurve/bottom-left-active.xpm
+++ b/themes/microcurve/bottom-left-active.xpm
@@ -7,11 +7,11 @@ static char * bottom_left_active_xpm[] = {
 "&      c #9B9B8A s active_mid_2",
 "%      c #FFFFFF s active_hilight_2",
 "*      c #9B9B8A s active_shadow_2",
-".%@*    ",
-".%@*    ",
-".%@*    ",
-".%@*    ",
-".%@*****",
+".%@.    ",
+".%@.    ",
+".%@.    ",
+".%@.    ",
+".%@.....",
 ".%@%%%%%",
 ".@******",
 "........"};
diff --git a/themes/microcurve/bottom-left-inactive.xpm b/themes/microcurve/bottom-left-inactive.xpm
index 8aac0afa7a216c9604917033d6874fc8664d1ee6..ef185ede8bb19d3e2967f7414b1e9144c5e3a469 100644
--- a/themes/microcurve/bottom-left-inactive.xpm
+++ b/themes/microcurve/bottom-left-inactive.xpm
@@ -7,11 +7,11 @@ static char * bottom_left_inactive_xpm[] = {
 "&      c #9B9B8A s inactive_mid_2",
 "%      c #FFFFFF s inactive_hilight_2",
 "*      c #9B9B8A s inactive_shadow_2",
-".%@*    ",
-".%@*    ",
-".%@*    ",
-".%@*    ",
-".%@*****",
+".%@.    ",
+".%@.    ",
+".%@.    ",
+".%@.    ",
+".%@.....",
 ".%@%%%%%",
 ".@******",
 "........"};
diff --git a/themes/microcurve/bottom-right-active.xpm b/themes/microcurve/bottom-right-active.xpm
index 77e7a43a3bde31d61409db933bef96b1fe2784e9..b3b79f6b314a3bff533204e02aa38374d2312b7b 100644
--- a/themes/microcurve/bottom-right-active.xpm
+++ b/themes/microcurve/bottom-right-active.xpm
@@ -7,11 +7,11 @@ static char * bottom_right_active_xpm[] = {
 "&      c #9B9B8A s active_mid_2",
 "%      c #FFFFFF s active_hilight_2",
 "*      c #9B9B8A s active_shadow_2",
-"    *%*.",
-"    *%*.",
-"    *%*.",
-"    *%*.",
-"*****%*.",
+"    .%*.",
+"    .%*.",
+"    .%*.",
+"    .%*.",
+".....%*.",
 "%%%%%%*.",
 "*******.",
 "........"};
diff --git a/themes/microcurve/bottom-right-inactive.xpm b/themes/microcurve/bottom-right-inactive.xpm
index 71c77fd0de4da66b44a02f30981c35a3c53d072a..c176af4671094073700f9d572b15ea362471be7e 100644
--- a/themes/microcurve/bottom-right-inactive.xpm
+++ b/themes/microcurve/bottom-right-inactive.xpm
@@ -7,11 +7,11 @@ static char * bottom_right_inactive_xpm[] = {
 "&      c #9B9B8A s inactive_mid_2",
 "%      c #FFFFFF s inactive_hilight_2",
 "*      c #9B9B8A s inactive_shadow_2",
-"    *%*.",
-"    *%*.",
-"    *%*.",
-"    *%*.",
-"*****%*.",
+"    .%*.",
+"    .%*.",
+"    .%*.",
+"    .%*.",
+".....%*.",
 "%%%%%%*.",
 "*******.",
 "........"};
diff --git a/themes/microcurve/close-active.xpm b/themes/microcurve/close-active.xpm
index 6313648bf927d3d6f43251ec3a98da11e934ca8b..4d7c946d66f82422735d98bc6d32b7182284c84e 100644
--- a/themes/microcurve/close-active.xpm
+++ b/themes/microcurve/close-active.xpm
@@ -19,6 +19,6 @@ static char * close_active_xpm[] = {
 "@@@...#...@@@",
 "@@@..#@#..@@@",
 "@@@##@@@##@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/close-inactive.xpm b/themes/microcurve/close-inactive.xpm
index ed598b440c1799b0e9664ecceb9f91588f331677..599a66e21406e6abea277a73fdb9687929b7af2e 100644
--- a/themes/microcurve/close-inactive.xpm
+++ b/themes/microcurve/close-inactive.xpm
@@ -3,10 +3,10 @@ static char * close_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * close_inactive_xpm[] = {
 "@@@...#...@@@",
 "@@@..#@#..@@@",
 "@@@##@@@##@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/close-pressed.xpm b/themes/microcurve/close-pressed.xpm
index 86def16e873718309e57f79276ea74bdf34c99ed..7dbc4200965693d916d783b903aea3fe3cee49fe 100644
--- a/themes/microcurve/close-pressed.xpm
+++ b/themes/microcurve/close-pressed.xpm
@@ -19,5 +19,5 @@ static char * close_pressed_xpm[] = {
 "+##...#...##+",
 "+##..###..##+",
 "+###########+",
-"+###########+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/hide-active.xpm b/themes/microcurve/hide-active.xpm
index 151ed5f41e117a3b642b1a811c42d91acd9f0d3f..78e49097228238e3f1882694db754cb8930d025c 100644
--- a/themes/microcurve/hide-active.xpm
+++ b/themes/microcurve/hide-active.xpm
@@ -19,6 +19,6 @@ static char * hide_active_xpm[] = {
 "@@@@@###@@@@@",
 "@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/hide-inactive.xpm b/themes/microcurve/hide-inactive.xpm
index bce1ed3aabd6bc81ef661bab2a01aec0b7a1ff9a..b526ae8e444ab416f68da602d907047021d56224 100644
--- a/themes/microcurve/hide-inactive.xpm
+++ b/themes/microcurve/hide-inactive.xpm
@@ -3,10 +3,10 @@ static char * hide_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * hide_inactive_xpm[] = {
 "@@@@@###@@@@@",
 "@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/hide-pressed.xpm b/themes/microcurve/hide-pressed.xpm
index bc4270ebc56ad06055bff76452bba12eef4051e1..5118e2ae5d12379cf61c4900b712fc08681f3fe3 100644
--- a/themes/microcurve/hide-pressed.xpm
+++ b/themes/microcurve/hide-pressed.xpm
@@ -19,5 +19,5 @@ static char * hide_pressed_xpm[] = {
 "+###########+",
 "+###########+",
 "+###########+",
-"+###########+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/left-active.xpm b/themes/microcurve/left-active.xpm
index dd802ce9de24e3e095329d3a840e742ff9427151..c971a0e075a82e796537762bdf9a8caff3fc74dc 100644
--- a/themes/microcurve/left-active.xpm
+++ b/themes/microcurve/left-active.xpm
@@ -6,35 +6,35 @@ static char * left_active_xpm[] = {
 "+	c #FFFFFF s active_hilight_2",
 "@	c #D6D6CC s active_color_2",
 "#	c #9B9B8A s active_shadow_2",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#"};
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@."};
diff --git a/themes/microcurve/left-inactive.xpm b/themes/microcurve/left-inactive.xpm
index 19b3595afb5e45a34ef45822e4cd2a0fa1236d91..7211838482d21a636c12a8120b021ae7b9a71a12 100644
--- a/themes/microcurve/left-inactive.xpm
+++ b/themes/microcurve/left-inactive.xpm
@@ -6,35 +6,35 @@ static char * left_inactive_xpm[] = {
 "+	c #FFFFFF s inactive_hilight_2",
 "@	c #D6D6CC s inactive_color_2",
 "#	c #9B9B8A s inactive_shadow_2",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#",
-".+@#"};
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@.",
+".+@."};
diff --git a/themes/microcurve/maximize-active.xpm b/themes/microcurve/maximize-active.xpm
index 2b79cd0d6820f901282bab7f2bf0a7a21bf51bb1..5843677ded28c61ffed731775c9bbf7eceae0687 100644
--- a/themes/microcurve/maximize-active.xpm
+++ b/themes/microcurve/maximize-active.xpm
@@ -19,6 +19,6 @@ static char * maximize_active_xpm[] = {
 "@@@.......@@@",
 "@@@.......@@@",
 "@@@#######@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/maximize-inactive.xpm b/themes/microcurve/maximize-inactive.xpm
index ee1530edfab0cfe96d1cb6847d7940c17b3a4106..f1bdc975a7c193fc8cdffaed557ffb2c3b2992b8 100644
--- a/themes/microcurve/maximize-inactive.xpm
+++ b/themes/microcurve/maximize-inactive.xpm
@@ -3,10 +3,10 @@ static char * maximize_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * maximize_inactive_xpm[] = {
 "@@@.......@@@",
 "@@@.......@@@",
 "@@@#######@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/maximize-pressed.xpm b/themes/microcurve/maximize-pressed.xpm
index d4a93e9d644537e75781eb4bbcaa708485edc50e..2335e37fbe881252e38ac4220510a7e67d2edd81 100644
--- a/themes/microcurve/maximize-pressed.xpm
+++ b/themes/microcurve/maximize-pressed.xpm
@@ -19,5 +19,5 @@ static char * maximize_pressed_xpm[] = {
 "+@@.......@@+",
 "+@@.......@@+",
 "+@@@@@@@@@@@+",
-"+@@@@@@@@@@@+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/menu-active.xpm b/themes/microcurve/menu-active.xpm
index bae0c5916dfcefa31d7c60049da75310458fe871..28fb5719955ea5c075f7469abd9afc38bf16d056 100644
--- a/themes/microcurve/menu-active.xpm
+++ b/themes/microcurve/menu-active.xpm
@@ -19,6 +19,6 @@ static char * menu_active_xpm[] = {
 "@@@@@#.#@@@@@",
 "@@@@@@#@@@@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/menu-inactive.xpm b/themes/microcurve/menu-inactive.xpm
index 558f8d7d3edcd21fbd477c9ac8e6444a47814354..acd089f974e3a0e6175f8a47686e6f8734f7a331 100644
--- a/themes/microcurve/menu-inactive.xpm
+++ b/themes/microcurve/menu-inactive.xpm
@@ -3,10 +3,10 @@ static char * menu_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * menu_inactive_xpm[] = {
 "@@@@@#.#@@@@@",
 "@@@@@@#@@@@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/menu-pressed.xpm b/themes/microcurve/menu-pressed.xpm
index 9751dfbee5bf93561f6670f169ade915590d1655..77ffdedcbed2bef50c2d795edffa3a01268a0803 100644
--- a/themes/microcurve/menu-pressed.xpm
+++ b/themes/microcurve/menu-pressed.xpm
@@ -19,5 +19,5 @@ static char * menu_pressed_xpm[] = {
 "+#####.#####+",
 "+###########+",
 "+###########+",
-"+###########+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/right-active.xpm b/themes/microcurve/right-active.xpm
index 1be091a198d122381644e71246b51771de4a55fc..d1b6b4071a5a74378efe0da66e450f84086e8c6e 100644
--- a/themes/microcurve/right-active.xpm
+++ b/themes/microcurve/right-active.xpm
@@ -6,35 +6,35 @@ static char * right_active_xpm[] = {
 "+	c #D6D6CC s active_color_2",
 "#      c #FFFFFF s active_hilight_2",
 "@	c #000000",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@"};
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@"};
diff --git a/themes/microcurve/right-inactive.xpm b/themes/microcurve/right-inactive.xpm
index 6469a337c1a07a704ef280ed3f937bd3827fbba5..74fa5e9443d2cc2ee8ad3db1549da6e0e320bd82 100644
--- a/themes/microcurve/right-inactive.xpm
+++ b/themes/microcurve/right-inactive.xpm
@@ -6,35 +6,35 @@ static char * right_inactive_xpm[] = {
 "+	c #D6D6CC s inactive_color_2",
 "#      c #FFFFFF s inactive_hilight_2",
 "@	c #000000",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@",
-".#.@"};
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@",
+"@#.@"};
diff --git a/themes/microcurve/shade-active.xpm b/themes/microcurve/shade-active.xpm
index 722a01095137a6479c802488381262b50553abe3..ba296efabaed115460f4a51b65586c28814f8dad 100644
--- a/themes/microcurve/shade-active.xpm
+++ b/themes/microcurve/shade-active.xpm
@@ -19,6 +19,6 @@ static char * shade_active_xpm[] = {
 "@@@..#@#..@@@",
 "@@@##@@@##@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/shade-inactive.xpm b/themes/microcurve/shade-inactive.xpm
index 46981b0a79619e2035a16f6d9cb12fe178881c92..32d0706b75beec03da252958e2aeb86a36e9cf68 100644
--- a/themes/microcurve/shade-inactive.xpm
+++ b/themes/microcurve/shade-inactive.xpm
@@ -3,10 +3,10 @@ static char * shade_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * shade_inactive_xpm[] = {
 "@@@..#@#..@@@",
 "@@@##@@@##@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/shade-pressed.xpm b/themes/microcurve/shade-pressed.xpm
index e17c5fa25292bd40ead2daa943f610d76b2a1a9b..06c7ee88a7e4432b70120bd6be8d886092f8df43 100644
--- a/themes/microcurve/shade-pressed.xpm
+++ b/themes/microcurve/shade-pressed.xpm
@@ -19,5 +19,5 @@ static char * shade_pressed_xpm[] = {
 "+@@..@@@..@@+",
 "+@@@@@@@@@@@+",
 "+@@@@@@@@@@@+",
-"+@@@@@@@@@@@+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/stick-active.xpm b/themes/microcurve/stick-active.xpm
index 3a3437808b92d118f1462d9d730c19e95513e13f..01e9aabd2e0d2148a1c30dc25abcc193ce09fe48 100644
--- a/themes/microcurve/stick-active.xpm
+++ b/themes/microcurve/stick-active.xpm
@@ -19,6 +19,6 @@ static char * stick_active_xpm[] = {
 "@@@@@@.##.@@@",
 "@@@@@@#@@#@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/stick-inactive.xpm b/themes/microcurve/stick-inactive.xpm
index 42d01bf4ea65a7b68b9986de8fcae92eb2e75e35..a2a2ddf69973e7fda3e5aafc95f418d81c423c25 100644
--- a/themes/microcurve/stick-inactive.xpm
+++ b/themes/microcurve/stick-inactive.xpm
@@ -3,10 +3,10 @@ static char * stick_inactive_xpm[] = {
 "13 15 6 1",
 " 	c None",
 ".	c #000000",
-"+	c #A49CD3 s inactive_hilight_1",
-"@	c #5649A8 s inactive_color_1",
-"#	c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
+"&	c #ABABAA s inactive_mid_1",
 ".............",
 "+++++++++++++",
 "@@@@@@@@@@@@@",
@@ -19,6 +19,6 @@ static char * stick_inactive_xpm[] = {
 "@@@@@@.##.@@@",
 "@@@@@@#@@#@@@",
 "@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&",
-"#############"};
+"#############",
+"............."};
diff --git a/themes/microcurve/stick-pressed.xpm b/themes/microcurve/stick-pressed.xpm
index 99d1d0b9b933325fefa3f0dfbd298c13232726a7..4d48e7027f310b86a349ccf9bab59c1a2740ba9a 100644
--- a/themes/microcurve/stick-pressed.xpm
+++ b/themes/microcurve/stick-pressed.xpm
@@ -19,5 +19,5 @@ static char * stick_pressed_xpm[] = {
 "+@@@@@.@@.@@+",
 "+@@@@@@@@@@@+",
 "+@@@@@@@@@@@+",
-"+@@@@@@@@@@@+",
-"+++++++++++++"};
+"+++++++++++++",
+"............."};
diff --git a/themes/microcurve/themerc b/themes/microcurve/themerc
index 17a2596cc1c028d67f2998f337745074be00b2f6..3dc7ae4e70abfd50c51e60c667366d8b06553bfa 100644
--- a/themes/microcurve/themerc
+++ b/themes/microcurve/themerc
@@ -1,5 +1,5 @@
 full_width_title=true
 button_offset=0
 button_spacing=0
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=0
+title_vertical_offset_inactive=0
diff --git a/themes/microcurve/title-1-active.xpm b/themes/microcurve/title-1-active.xpm
index bf42c6aa69471a7e385426c3be966de5e997ebd7..57ff807e64f9113969770032389f684b482061b3 100644
--- a/themes/microcurve/title-1-active.xpm
+++ b/themes/microcurve/title-1-active.xpm
@@ -20,4 +20,4 @@ static char * title_1_active_xpm[] = {
 "@@@@",
 "@@@@",
 "@@@@",
-"####"};
+"...."};
diff --git a/themes/microcurve/title-1-inactive.xpm b/themes/microcurve/title-1-inactive.xpm
index fd1361b8e6e41a48dbceae8857b5206d78187e1b..2232072bf026d5ce0ad20a8e8ae6650fede93864 100644
--- a/themes/microcurve/title-1-inactive.xpm
+++ b/themes/microcurve/title-1-inactive.xpm
@@ -3,9 +3,9 @@ static char * title_1_inactive_xpm[] = {
 "4 15 5 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D6D6CC s inactive_color_2",
-"#	c #9B9B8A s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
 "....",
 "++++",
 "@@@@",
@@ -20,4 +20,4 @@ static char * title_1_inactive_xpm[] = {
 "@@@@",
 "@@@@",
 "@@@@",
-"####"};
+"...."};
diff --git a/themes/microcurve/title-2-active.xpm b/themes/microcurve/title-2-active.xpm
index 1460c301b73b5277493527a4b7c1a88d1d4e1b01..ed8fe381b291a4c0372d955df638840757a5f701 100644
--- a/themes/microcurve/title-2-active.xpm
+++ b/themes/microcurve/title-2-active.xpm
@@ -20,5 +20,5 @@ static char * title_2_active_xpm[] = {
 "*%%%%%%%%%",
 "*%%%%%%%%%",
 "*&&&&&&&&&",
-"*&&&&&&&&&",
-"**********"};
+"**********",
+".........."};
diff --git a/themes/microcurve/title-2-inactive.xpm b/themes/microcurve/title-2-inactive.xpm
index 18da238c13d85483c71b1d007206cf4486bbccb3..adeb28cf52dc65af38e99140112aa846cc4dadb5 100644
--- a/themes/microcurve/title-2-inactive.xpm
+++ b/themes/microcurve/title-2-inactive.xpm
@@ -20,5 +20,5 @@ static char * title_2_inactive_xpm[] = {
 "*%%%%%%%%%",
 "*%%%%%%%%%",
 "*&&&&&&&&&",
-"*&&&&&&&&&",
-"**********"};
+"**********",
+".........."};
diff --git a/themes/microcurve/title-3-active.xpm b/themes/microcurve/title-3-active.xpm
index 2c90f5a1481f6ce659b400054b8183b88db4e931..0239196abe0db94ce0a4a8f254df4e75da88bf25 100644
--- a/themes/microcurve/title-3-active.xpm
+++ b/themes/microcurve/title-3-active.xpm
@@ -20,5 +20,5 @@ static char * title_3_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "########",
-"########",
-"$$$$$$$$"};
+"$$$$$$$$",
+"........"};
diff --git a/themes/microcurve/title-3-inactive.xpm b/themes/microcurve/title-3-inactive.xpm
index fe36c3c1d0dc4691c9844126fcbf13a893eef476..e46f484c371c2c2d924a3d04b843f7b09544f46b 100644
--- a/themes/microcurve/title-3-inactive.xpm
+++ b/themes/microcurve/title-3-inactive.xpm
@@ -20,5 +20,5 @@ static char * title_3_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "########",
-"########",
-"$$$$$$$$"};
+"$$$$$$$$",
+"........"};
diff --git a/themes/microcurve/title-4-active.xpm b/themes/microcurve/title-4-active.xpm
index 0a29d0212f0975988516bdd6c3a76b853f2a8be6..55b972f32b00fc80a576110bbb3b2edef27df891 100644
--- a/themes/microcurve/title-4-active.xpm
+++ b/themes/microcurve/title-4-active.xpm
@@ -20,5 +20,5 @@ static char * title_4_active_xpm[] = {
 "@@@@@@@@@$",
 "@@@@@@@@@$",
 "&&&&&&&&&$",
-"&&&&&&&&&$",
-"$$$$$$$$$$"};
+"$$$$$$$$$$",
+".........."};
diff --git a/themes/microcurve/title-4-inactive.xpm b/themes/microcurve/title-4-inactive.xpm
index 81ba76387ef91395b352419a3e7727a54bd5bada..9211d39cb0030d5ebe63a6fa2492712998370005 100644
--- a/themes/microcurve/title-4-inactive.xpm
+++ b/themes/microcurve/title-4-inactive.xpm
@@ -20,5 +20,5 @@ static char * title_4_inactive_xpm[] = {
 "@@@@@@@@@$",
 "@@@@@@@@@$",
 "&&&&&&&&&$",
-"&&&&&&&&&$",
-"$$$$$$$$$$"};
+"$$$$$$$$$$",
+".........."};
diff --git a/themes/microcurve/title-5-active.xpm b/themes/microcurve/title-5-active.xpm
index b8606481caa951f79c062bb4fca7e9073c732ddf..3eb18e23dad17c6ef51c683568d6d589a1cc6967 100644
--- a/themes/microcurve/title-5-active.xpm
+++ b/themes/microcurve/title-5-active.xpm
@@ -20,4 +20,4 @@ static char * title_5_active_xpm[] = {
 "@@@@",
 "@@@@",
 "@@@@",
-"####"};
+"...."};
diff --git a/themes/microcurve/title-5-inactive.xpm b/themes/microcurve/title-5-inactive.xpm
index e838dee7007c8e824d5e6ecf44f716f55b052723..987bf603e3c5931c8e70eed3d9d9bd709b102205 100644
--- a/themes/microcurve/title-5-inactive.xpm
+++ b/themes/microcurve/title-5-inactive.xpm
@@ -3,9 +3,9 @@ static char * title_5_inactive_xpm[] = {
 "4 15 5 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D6D6CC s inactive_color_2",
-"#	c #9B9B8A s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_1",
+"@	c #D6D6CC s inactive_color_1",
+"#	c #9B9B8A s inactive_shadow_1",
 "....",
 "++++",
 "@@@@",
@@ -20,4 +20,4 @@ static char * title_5_inactive_xpm[] = {
 "@@@@",
 "@@@@",
 "@@@@",
-"####"};
+"...."};
diff --git a/themes/microcurve/top-left-active.xpm b/themes/microcurve/top-left-active.xpm
index b8f1e9b2474a22d0c214ff8f9a35bfda5f579757..35924a93883c73bd5b17ade9cc3cd1c438c195c3 100644
--- a/themes/microcurve/top-left-active.xpm
+++ b/themes/microcurve/top-left-active.xpm
@@ -6,7 +6,7 @@ static char * top_left_active_xpm[] = {
 "+      c #FFFFFF s active_hilight_2",
 "@      c #D6D6CC s active_color_2",
 "#      c #9B9B8A s active_shadow_2",
-"&	c #ABABAA s active_mid_2",
+"&      c #ABABAA s active_mid_2",
 "    ",
 "  ..",
 " .++",
@@ -19,6 +19,6 @@ static char * top_left_active_xpm[] = {
 ".+@@",
 ".+@@",
 ".+@@",
-".+@@",
-".&&&",
-".###"};
+".+@&",
+".+##",
+"...."};
diff --git a/themes/microcurve/top-left-inactive.xpm b/themes/microcurve/top-left-inactive.xpm
index 360dee0e708e1d5e6122c7ca91cde9372edf916b..5b3663e9725b7413254c75ccd266b80f267c30c3 100644
--- a/themes/microcurve/top-left-inactive.xpm
+++ b/themes/microcurve/top-left-inactive.xpm
@@ -3,10 +3,10 @@ static char * top_left_inactive_xpm[] = {
 "4 15 6 1",
 "       c None",
 ".      c #000000",
-"+      c #A49CD3 s inactive_hilight_1",
-"@      c #5649A8 s inactive_color_1",
-"#      c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+      c #FFFFFF s inactive_hilight_1",
+"@      c #D6D6CC s inactive_color_1",
+"#      c #9B9B8A s inactive_shadow_1",
+"&      c #ABABAA s inactive_mid_1",
 "    ",
 "  ..",
 " .++",
@@ -19,6 +19,6 @@ static char * top_left_inactive_xpm[] = {
 ".+@@",
 ".+@@",
 ".+@@",
-".+@@",
-".+&&",
-".###"};
+".+@&",
+".+##",
+"...."};
diff --git a/themes/microcurve/top-right-active.xpm b/themes/microcurve/top-right-active.xpm
index 6325393f4f961e5440b4f2ab63e28be79a49415a..57f845ed3e6de1118cb0b9be16880d7f5192f1c1 100644
--- a/themes/microcurve/top-right-active.xpm
+++ b/themes/microcurve/top-right-active.xpm
@@ -6,19 +6,19 @@ static char * top_right_active_xpm[] = {
 "+      c #FFFFFF s active_hilight_2",
 "@      c #D6D6CC s active_color_2",
 "#      c #9B9B8A s active_shadow_2",
-"&	c #ABABAA s active_mid_2",
+"&      c #ABABAA s active_mid_2",
 "    ",
 "..  ",
-"@#. ",
-"@#. ",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
+"&#. ",
+"&#. ",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
 "&&#.",
-"###."};
+"###.",
+"...."};
diff --git a/themes/microcurve/top-right-inactive.xpm b/themes/microcurve/top-right-inactive.xpm
index df5648e49761cd71dce9b37b4a703b4ea44ca840..9683937768453b4aaba4ec05f130e938b2c3ccfa 100644
--- a/themes/microcurve/top-right-inactive.xpm
+++ b/themes/microcurve/top-right-inactive.xpm
@@ -3,22 +3,22 @@ static char * top_right_inactive_xpm[] = {
 "4 15 6 1",
 "       c None",
 ".      c #000000",
-"+      c #A49CD3 s inactive_hilight_1",
-"@      c #5649A8 s inactive_color_1",
-"#      c #453A87 s inactive_shadow_1",
-"&	c #6356B5 s inactive_mid_1",
+"+      c #FFFFFF s inactive_hilight_1",
+"@      c #D6D6CC s inactive_color_1",
+"#      c #9B9B8A s inactive_shadow_1",
+"&      c #ABABAA s inactive_mid_1",
 "    ",
 "..  ",
-"@#. ",
-"@#. ",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
-"@@#.",
+"&#. ",
+"&#. ",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
+"@&#.",
 "&&#.",
-"###."};
+"###.",
+"...."};