diff --git a/themes/atlanta2/close-active.xpm b/themes/atlanta2/close-active.xpm
index bf0e1733dbaabc76d587d1f2a87892461981595c..94c8103cbb087719e8c3aed6af5ef30489f232bb 100644
--- a/themes/atlanta2/close-active.xpm
+++ b/themes/atlanta2/close-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * close_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/close-inactive.xpm b/themes/atlanta2/close-inactive.xpm
index ad922123a7e2d3f5e0bfbfe193b0f77ef2868e4d..f3ee92b99c613c3e0c0d5f5d96a2f8f95ecf8e7c 100644
--- a/themes/atlanta2/close-inactive.xpm
+++ b/themes/atlanta2/close-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * close_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/close-pressed.xpm b/themes/atlanta2/close-pressed.xpm
index 50098340aaaac20766d05f380751ea5584a053a1..c1dc7ef8db0d7d6adce7b8f6a0943313f1aab485 100644
--- a/themes/atlanta2/close-pressed.xpm
+++ b/themes/atlanta2/close-pressed.xpm
@@ -1,18 +1,16 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$@@$$$@@$$$+#",
 ".@$$$@@@$@@@$$$+#",
 ".@$$$$@@@@@$$$$+#",
@@ -22,6 +20,5 @@ static char * close_pressed_xpm[] = {
 ".@$$$@@$$$@@$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/hide-active.xpm b/themes/atlanta2/hide-active.xpm
index edf513f0102569938b71699918fcd6b7b325bc83..9abe4a924850b4b93526c30b620c8d95c4b58844 100644
--- a/themes/atlanta2/hide-active.xpm
+++ b/themes/atlanta2/hide-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * hide_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/hide-inactive.xpm b/themes/atlanta2/hide-inactive.xpm
index 619599fd61ab08ecb04338b4e5c67e79a87822bf..ceb48b85096e89c5917cd8ee10db4cac7dd47808 100644
--- a/themes/atlanta2/hide-inactive.xpm
+++ b/themes/atlanta2/hide-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * hide_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/hide-pressed.xpm b/themes/atlanta2/hide-pressed.xpm
index 0dd68a809d7936d0e53b0c4d1bb13f7a6b6d90f5..d477ecb862bdfb25605031ef0abc0e41335db568 100644
--- a/themes/atlanta2/hide-pressed.xpm
+++ b/themes/atlanta2/hide-pressed.xpm
@@ -1,13 +1,12 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
@@ -17,11 +16,9 @@ static char * hide_pressed_xpm[] = {
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/maximize-active.xpm b/themes/atlanta2/maximize-active.xpm
index 002bc76335ce5bb473f6c02839d85532cd9c870c..6ccd643ff5b1cce84676337f59a6afcfd0e4d3e5 100644
--- a/themes/atlanta2/maximize-active.xpm
+++ b/themes/atlanta2/maximize-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * maximize_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/maximize-inactive.xpm b/themes/atlanta2/maximize-inactive.xpm
index 2335ad7756f41dc61f4a9df9cef0b61f406a93f4..f9f173d16a9b5de25fc35f7c29fd35823d100bf3 100644
--- a/themes/atlanta2/maximize-inactive.xpm
+++ b/themes/atlanta2/maximize-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * maximize_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/maximize-pressed.xpm b/themes/atlanta2/maximize-pressed.xpm
index 18377a9c73df4182bb9834123be28e1c61ad4a56..3814b547a40996e35a59128af3ebd50d650f8df6 100644
--- a/themes/atlanta2/maximize-pressed.xpm
+++ b/themes/atlanta2/maximize-pressed.xpm
@@ -1,18 +1,16 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$@@@@@@@$$$+#",
@@ -22,6 +20,5 @@ static char * maximize_pressed_xpm[] = {
 ".@$$$@@@@@@@$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/menu-active.xpm b/themes/atlanta2/menu-active.xpm
index fc7e10d564461936779fd1f9598f682f23b67b5a..3149d53598f2e223f68c14a20e69afedce40967e 100644
--- a/themes/atlanta2/menu-active.xpm
+++ b/themes/atlanta2/menu-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * menu_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/menu-inactive.xpm b/themes/atlanta2/menu-inactive.xpm
index f88883327e7c7d2857e071c5701d0d31fc11405c..46060cd293608fd63da4329f1919f6f08e0aab9c 100644
--- a/themes/atlanta2/menu-inactive.xpm
+++ b/themes/atlanta2/menu-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * menu_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/menu-pressed.xpm b/themes/atlanta2/menu-pressed.xpm
index 2fa5cc495332fde48b6b9f08f5bc0e687e5af2c0..d8b6bb64da3225baa8560a9ad91a139446026b83 100644
--- a/themes/atlanta2/menu-pressed.xpm
+++ b/themes/atlanta2/menu-pressed.xpm
@@ -1,19 +1,17 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$@@@@@@@$$$+#",
 ".@$$$$@@@@@$$$$+#",
@@ -22,6 +20,5 @@ static char * menu_pressed_xpm[] = {
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/shade-active.xpm b/themes/atlanta2/shade-active.xpm
index 147c522e5f125d277f8dfa95838cf5932d8cfafe..80f4a6aed1830422da9bbc798bd9a02533aa5393 100644
--- a/themes/atlanta2/shade-active.xpm
+++ b/themes/atlanta2/shade-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * shade_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/shade-inactive.xpm b/themes/atlanta2/shade-inactive.xpm
index 28571c9c059b6bef7e76f5636d2c6a751d9f1081..47c9988abb4b20e792549c011f0af9148a77e8f2 100644
--- a/themes/atlanta2/shade-inactive.xpm
+++ b/themes/atlanta2/shade-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * shade_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/shade-pressed.xpm b/themes/atlanta2/shade-pressed.xpm
index 9b432b5efc5e27398590a57005c194090b52e805..77f51743a739ad4941135fa0029c551de4fa31c5 100644
--- a/themes/atlanta2/shade-pressed.xpm
+++ b/themes/atlanta2/shade-pressed.xpm
@@ -1,19 +1,17 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$$$$@$$$$$$+#",
 ".@$$$$$@@@$$$$$+#",
 ".@$$$$@@@@@$$$$+#",
@@ -22,6 +20,5 @@ static char * shade_pressed_xpm[] = {
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/stick-active.xpm b/themes/atlanta2/stick-active.xpm
index f11fe0d874a02cbc28e64d82e4cb0305915d7e9f..52649f86695a7a13f62fc9df0c035b0e903b7076 100644
--- a/themes/atlanta2/stick-active.xpm
+++ b/themes/atlanta2/stick-active.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #000000",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #000000",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * stick_active_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/stick-inactive.xpm b/themes/atlanta2/stick-inactive.xpm
index bd880da2f3e4a065059f6b346b63331f498049ec..8fb39cab6a3922dd5e1655a88d7480da4f839083 100644
--- a/themes/atlanta2/stick-inactive.xpm
+++ b/themes/atlanta2/stick-inactive.xpm
@@ -1,11 +1,9 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"17 18 3 1",
-" 	c None",
-".	c #E6E6E6 s active_color_2",
-"+	c #A4A19C s active_shadow_2",
-"                 ",
-".................",
+"17 15 3 1",
+"       c None",
+".      c #E6E6E6 s active_color_2",
+"+      c #A4A19C s active_shadow_2",
 ".................",
 ".................",
 ".................",
@@ -20,5 +18,4 @@ static char * stick_inactive_xpm[] = {
 ".................",
 ".................",
 ".................",
-".................",
 "................."};
diff --git a/themes/atlanta2/stick-pressed.xpm b/themes/atlanta2/stick-pressed.xpm
index f8882c32249a3faba40cc048ac8b00214151f66c..70b99ea948a85fae08dd9064598201ffbc088320 100644
--- a/themes/atlanta2/stick-pressed.xpm
+++ b/themes/atlanta2/stick-pressed.xpm
@@ -1,18 +1,16 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"17 18 6 1",
-" 	c None",
-".	c #A4A19C s active_shadow_2",
-"+	c #E6E6E6 s active_color_2",
-"@	c #000000",
-"#	c #FFFFFF s active_hilight_2",
-"$	c #CDCECD s active_mid_2",
-"                 ",
+"17 15 6 1",
+"       c None",
+".      c #A4A19C s active_shadow_2",
+"+      c #E6E6E6 s active_color_2",
+"@      c #000000",
+"#      c #FFFFFF s active_hilight_2",
+"$      c #CDCECD s active_mid_2",
 "................+",
 ".@@@@@@@@@@@@@@+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$@$@$$$+#",
 ".@$$$$$$$@@@$$$+#",
 ".@$$$@@@@@$@$$$+#",
@@ -22,6 +20,5 @@ static char * stick_pressed_xpm[] = {
 ".@$$$$$$$@$@$$$+#",
 ".@$$$$$$$$$$$$$+#",
 ".@$$$$$$$$$$$$$+#",
-".@$$$$$$$$$$$$$+#",
 ".+++++++++++++++#",
 "+################"};
diff --git a/themes/atlanta2/themerc b/themes/atlanta2/themerc
index 5785a1796f805250d859a3bdf4c3dcc2ba2a901d..4c566e60fbaac4bdc2c3b2f2a2e7cfe195556808 100644
--- a/themes/atlanta2/themerc
+++ b/themes/atlanta2/themerc
@@ -1,6 +1,6 @@
 full_width_title=true
 button_offset=0
 button_spacing=0
-title_horizontal_offset=5
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
+title_horizontal_offset=0
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
diff --git a/themes/atlanta2/title-1-active.xpm b/themes/atlanta2/title-1-active.xpm
index 56b15278980bb972190d6f56bd271aa94e2a173c..a3568e1c3c7b8ba3a5831c08bd743d9cb2809276 100644
--- a/themes/atlanta2/title-1-active.xpm
+++ b/themes/atlanta2/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -26,7 +26,4 @@ static char * title_1_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########"};
diff --git a/themes/atlanta2/title-1-inactive.xpm b/themes/atlanta2/title-1-inactive.xpm
index 25223d7123882cefddc16d2282ee446ca01a8cc1..b6e95ed2ffb0bc0463687f58d7ba8c2f9f157883 100644
--- a/themes/atlanta2/title-1-inactive.xpm
+++ b/themes/atlanta2/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -26,7 +26,4 @@ static char * title_1_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########"};
diff --git a/themes/atlanta2/title-2-active.xpm b/themes/atlanta2/title-2-active.xpm
index ea699f18f22250eb34055c5b41012cae8f63c0e2..583952583c47aaf02fbd58488f1f20cc82ffad2e 100644
--- a/themes/atlanta2/title-2-active.xpm
+++ b/themes/atlanta2/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_active_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -10,26 +10,23 @@ static char * title_2_active_xpm[] = {
 "%	c #A4A19C s active_shadow_2",
 "*	c #59658A s active_hilight_1",
 "................",
-"+++++++++%******",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@%@@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@@+@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"%%%%%%%%%%$#####"};
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@$$$$$$$",
+"@@@@@@@@@$$$$$$$",
+"@@@@%@@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@@+@@@$$$$$$$",
+"@@@@@@@@@$$$$$$$",
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-2-inactive.xpm b/themes/atlanta2/title-2-inactive.xpm
index f72f894735f654bbe4ef8dec3ad4730e14f48d12..ed99dd2da65787ddb56ea3cf487c2d81ac290738 100644
--- a/themes/atlanta2/title-2-inactive.xpm
+++ b/themes/atlanta2/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_2_inactive_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -10,26 +10,23 @@ static char * title_2_inactive_xpm[] = {
 "%	c #A4A19C s inactive_shadow_2",
 "*	c #59658A s inactive_hilight_1",
 "................",
-"+++++++++%******",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@%@@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@%+@@@%*$$$$$",
-"@@@@@+@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"@@@@@@@@@%*$$$$$",
-"%%%%%%%%%%$#####"};
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@$$$$$$$",
+"@@@@@@@@@$$$$$$$",
+"@@@@%@@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@%+@@@$$$$$$$",
+"@@@@@+@@@$$$$$$$",
+"@@@@@@@@@$$$$$$$",
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-3-active.xpm b/themes/atlanta2/title-3-active.xpm
index 3eca8d6f17824862822cf5a8f879ef72f7014fc4..7a953da2cb912407e5c85d418a350e75e0ca3937 100644
--- a/themes/atlanta2/title-3-active.xpm
+++ b/themes/atlanta2/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_active_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -10,7 +10,8 @@ static char * title_3_active_xpm[] = {
 "%	c #A4A19C s active_shadow_2",
 "*	c #59658A s active_hilight_1",
 "................",
-"****************",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
@@ -27,9 +28,5 @@ static char * title_3_active_xpm[] = {
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"################"};
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-3-inactive.xpm b/themes/atlanta2/title-3-inactive.xpm
index a60c56d7c7e021f32fec8bca0fdb43986ffeb36a..a9fb1c5d3b9e51135a9369dfc822a5bd8b9de664 100644
--- a/themes/atlanta2/title-3-inactive.xpm
+++ b/themes/atlanta2/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_3_inactive_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -10,7 +10,8 @@ static char * title_3_inactive_xpm[] = {
 "%	c #A4A19C s inactive_shadow_2",
 "*	c #59658A s inactive_hilight_1",
 "................",
-"****************",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
@@ -27,9 +28,5 @@ static char * title_3_inactive_xpm[] = {
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
 "$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$",
-"################"};
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-4-active.xpm b/themes/atlanta2/title-4-active.xpm
index 3bb06bd76dab0f2697d7c68d1a45dce4e948f641..8aed8e3c28b6094b0e805a789f20d5d7c11514e5 100644
--- a/themes/atlanta2/title-4-active.xpm
+++ b/themes/atlanta2/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_active_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -10,26 +10,23 @@ static char * title_4_active_xpm[] = {
 "%	c #A4A19C s active_shadow_2",
 "*	c #59658A s active_hilight_1",
 "................",
-"*****$++++++++++",
-"$$$$$#+@@@@@@@@@",
-"$$$$$$+@@@@@@@@@",
-"$$$$$#+@@@@@@@@@",
-"$$$$$#+@@@%@@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@@+@@@@",
-"$$$$$#+@@@@@@@@@",
-"$$$$$#+@@@@@@@@@",
-"######@%%%%%%%%%"};
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"$$$$$$$@@@@@@@@@",
+"$$$$$$$@@@@@@@@@",
+"$$$$$$$@@@%@@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@@+@@@@",
+"$$$$$$$@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-4-inactive.xpm b/themes/atlanta2/title-4-inactive.xpm
index a67d4a1ba68921255c71d10ae1a502dcd6f853b9..6a726ca4281ed32c28d77df7c330fa27c69c8350 100644
--- a/themes/atlanta2/title-4-inactive.xpm
+++ b/themes/atlanta2/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_4_inactive_xpm[] = {
-"16 24 8 1",
+"16 21 8 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -10,26 +10,23 @@ static char * title_4_inactive_xpm[] = {
 "%	c #A4A19C s inactive_shadow_2",
 "*	c #59658A s inactive_hilight_1",
 "................",
-"*****$++++++++++",
-"$$$$$#+@@@@@@@@@",
-"$$$$$$+@@@@@@@@@",
-"$$$$$#+@@@@@@@@@",
-"$$$$$#+@@@%@@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@%+@@@@",
-"$$$$$#+@@@@+@@@@",
-"$$$$$#+@@@@@@@@@",
-"$$$$$#+@@@@@@@@@",
-"######@%%%%%%%%%"};
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"$$$$$$$@@@@@@@@@",
+"$$$$$$$@@@@@@@@@",
+"$$$$$$$@@@%@@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@%+@@@@",
+"$$$$$$$@@@@+@@@@",
+"$$$$$$$@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/atlanta2/title-5-active.xpm b/themes/atlanta2/title-5-active.xpm
index 429499078b48267e6866d65d1eaf9e0051706f87..cf278d975728f2bb374bd6e5c6b8d1413646bd95 100644
--- a/themes/atlanta2/title-5-active.xpm
+++ b/themes/atlanta2/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_active_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -26,7 +26,4 @@ static char * title_5_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########"};
diff --git a/themes/atlanta2/title-5-inactive.xpm b/themes/atlanta2/title-5-inactive.xpm
index 784ce1fe1015eed03f1b396416fd32949a15cfcd..920583a5975216ac8549f310a518cae78dfca66d 100644
--- a/themes/atlanta2/title-5-inactive.xpm
+++ b/themes/atlanta2/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_5_inactive_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -26,7 +26,4 @@ static char * title_5_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "########"};
diff --git a/themes/atlanta2/top-left-active.xpm b/themes/atlanta2/top-left-active.xpm
index a808b444a4a1275d36ea9048dd4a48733abee601..de8845047a059f5bebfb9ecf2b0db6e79efa81ec 100644
--- a/themes/atlanta2/top-left-active.xpm
+++ b/themes/atlanta2/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -26,7 +26,4 @@ static char * top_left_active_xpm[] = {
 ".+@@@@@@",
 ".+@@@@@@",
 ".+@@@@@@",
-".+@@@@@@",
-".+@@@@@@",
-".+@@@@@@",
 ".+@@@###"};
diff --git a/themes/atlanta2/top-left-inactive.xpm b/themes/atlanta2/top-left-inactive.xpm
index 4c695a32525dc256355e3f031f11b79df084db47..ae29eefd946c52c5b9e4f77b4760de1bcf0e82b1 100644
--- a/themes/atlanta2/top-left-inactive.xpm
+++ b/themes/atlanta2/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -26,7 +26,4 @@ static char * top_left_inactive_xpm[] = {
 ".+@@@@@@",
 ".+@@@@@@",
 ".+@@@@@@",
-".+@@@@@@",
-".+@@@@@@",
-".+@@@@@@",
 ".+@@@###"};
diff --git a/themes/atlanta2/top-right-active.xpm b/themes/atlanta2/top-right-active.xpm
index b35c9ba577c218b7e7c7a737da1c623d04d9ec9b..f32b08be7e5004227723c80e4c86bdca810e603b 100644
--- a/themes/atlanta2/top-right-active.xpm
+++ b/themes/atlanta2/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -26,7 +26,4 @@ static char * top_right_active_xpm[] = {
 "@@@@@@#.",
 "@@@@@@#.",
 "@@@@@@#.",
-"@@@@@@#.",
-"@@@@@@#.",
-"@@@@@@#.",
 "###@@@#."};
diff --git a/themes/atlanta2/top-right-inactive.xpm b/themes/atlanta2/top-right-inactive.xpm
index f2c1d7d613e81457203f6af9797f79ffddb69c8c..0a88f1c2ed95472625b1540bd9944ad4f2504535 100644
--- a/themes/atlanta2/top-right-inactive.xpm
+++ b/themes/atlanta2/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 24 5 1",
+"8 21 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s inactive_hilight_2",
@@ -26,7 +26,4 @@ static char * top_right_inactive_xpm[] = {
 "@@@@@@#.",
 "@@@@@@#.",
 "@@@@@@#.",
-"@@@@@@#.",
-"@@@@@@#.",
-"@@@@@@#.",
 "###@@@#."};