diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 4d6e285268233fd91b82cfd067d92ead5f4b7464..6fba9ea586de2ef5c31c6f9f69857df38a51a74d 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-17 00:03+0200\n"
+"POT-Creation-Date: 2004-08-17 21:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index afbd238b16b07f8d0143315c92ed4f3ffabecc60..bb61253093ead0d947968f15d313e089e171050d 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@.#@@@@#.@@@+",
-"+@@@###@@###@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@###@@###@@@+",
-"+@@@.#@@@@#.@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 4e0104489df57bee0ab6b6540fdc36cca653f1c9..8686292098eaa33c434099584851c2e157affcdf 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@+#@@@@#+@@@+",
-"+@@@###@@###@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@###@@###@@@+",
-"+@@@+#@@@@#+@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@+#@@@@#+@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@+#@@@@#+@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 5987faf9c38a49ed210e29123883ed5b2c115b47..1196141bf23759a2338a8e744b3b5b4e24da5800 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@######@@@@+",
-"+@@@@######@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 9ccefa616993bfb4645140b55cedd0f65304f035..9dfdfdd38a96ba99a0c107ee81fa722afe55d8cc 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@######@@@@+",
-"+@@@@######@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index d9ff03c1d6d017bb24cd435b7be4d043e0ec5ede..f659049b9cd7dca35356831d7ba6a9b38d2cf9e1 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@.######.@@@+",
-"+@@@########@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@########@@@+",
-"+@@@.######.@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index ac8c019960b907257a958dfdb3022123003090be..c962c1fa6c4d1594ed266e393b2757f7161e46ff 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@######@@@@+",
-"+@@@########@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@##@@@@##@@@+",
-"+@@@########@@@+",
-"+@@@@######@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index ebb8a01e9271ff53f383e06f2269ec7babfc348c..edfb7357645cfa397b6189e88609d9f691b0b3c5 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@.#####.@@+",
-"+@@@@@#######@@+",
-"+@@@@@@@@@@##@@+",
-"+@@.#####.@##@@+",
-"+@@#######@##@@+",
-"+@@##@@@##@##@@+",
-"+@@##@@@##@#.@@+",
-"+@@##@@@##@@@@@+",
-"+@@#######@@@@@+",
-"+@@.#####.@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@.#####.@@@+",
+"+@@@@@@#######@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@.#####.@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#.@@@+",
+"+@@@##@@@##@@@@@@+",
+"+@@@#######@@@@@@+",
+"+@@@.#####.@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index f7bbafdbf06d39bc52c256a7335a62c6ab577618..911c4421c976fdebbb63829d8ca8d624018e1d55 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@#####@@@+",
-"+@@@@@#######@@+",
-"+@@@@@@@@@@##@@+",
-"+@@@#####@@##@@+",
-"+@@#######@##@@+",
-"+@@##@@@##@##@@+",
-"+@@##@@@##@#@@@+",
-"+@@##@@@##@@@@@+",
-"+@@#######@@@@@+",
-"+@@@#####@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@#####@@@@+",
+"+@@@@@@#######@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@@#####@@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#@@@@+",
+"+@@@##@@@##@@@@@@+",
+"+@@@#######@@@@@@+",
+"+@@@@#####@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 36d5757758f9b523103ee17c602bfa683e5df668..d2a330dd3a45533b317401e161ed52900afd9d10 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@#@@@@#@@@@+",
-"+@@@###@@###@@@+",
-"+@@@########@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#@@@@#@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index f8d97ba16ff8566b83575ef1d2bb1576ce1d26ed..a7843129926f39d66953c1eb3e7a8435441f6b1b 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@#@@@@#@@@@+",
-"+@@@###@@###@@@+",
-"+@@@########@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#@@@@#@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 0bb06012315998ce09aea073de57ab2ae646c3a1..e66807828476260293cb8b5b882a8408f11c6a1a 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@########@@@+",
-"+@@@##@##@##@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index d44071a1fbfd747a7aa5fe5f2d664e8b29071fa9..da33f3ec010ca59adc56a9362b45f7ab508d06ec 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@######@@@@+",
-"+@@@########@@@+",
-"+@@@##@##@##@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 43aad80ebc5b068ee12ec41a7c833cef28115106..481b813e566debe6c89f509226dda1ffb2f78a53 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@##@##@##@@@+",
-"+@@@########@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 22e96a4df7673552c0f38f706014d23bd6d48ac1..a2208945c8770137d640e291ec3057bb3235a175 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,24 +1,26 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"16 16 5 1",
+"18 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@##@##@##@@@+",
-"+@@@########@@@+",
-"+@@@@######@@@@+",
-"+@@@@@####@@@@@+",
-"+@@@@@@##@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 5dd0f6a0690069a3810e3bcba885b7ad86f7dc96..3ad7fca9b9f207fe7289789cf3bb2835f4d5b1fd 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,25 +1,27 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"16 16 6 1",
+"18 18 6 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #949595 s active_color_1",
 "$	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@#$$$$#@@@@+",
-"+@@@#$$$$$$#@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@$$@@@@$$@@@+",
-"+@@@$$@@@@$$@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@#$$$$$$#@@@+",
-"+@@@@#$$$$#@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index a6cfaf38678578bacac1abdac07cd675c70d99fc..0224da6b44867831a2cbaa35f7cded4acb96e851 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,25 +1,27 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"16 16 6 1",
+"18 18 6 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #949595 s active_color_1",
 "$	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@+$$$$+@@@@+",
-"+@@@+$$$$$$+@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@$$@@@@$$@@@+",
-"+@@@$$@@@@$$@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@+$$$$$$+@@@+",
-"+@@@@+$$$$+@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 1877dad22b391dbc0886d38bf60e9ac40d1bd2de..23042008352ab1b66782dd934e9bdbaf8008f3e8 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,25 +1,27 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"16 16 6 1",
+"18 18 6 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
 "#	c #949595 s active_color_1",
 "$	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@#$$$$#@@@@+",
-"+@@@#$$$$$$#@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@$$@$$@$$@@@+",
-"+@@@$$@$$@$$@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@#$$$$$$#@@@+",
-"+@@@@#$$$$#@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 2da7d963d77a1868ce20e71d50b22de049dc22b1..1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,5 +1,22 @@
 /* XPM */
 static char * bouton_inactive_xpm[] = {
-"1 1 1 1",
+"1 18 1 1",
 " 	c None",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
 " "};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index ff13a28eb465275f2a2f80273d434f7b25dbf287..3d40893635b79034566a6cec7fb76442724d675a 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,25 +1,27 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"16 16 6 1",
+"18 18 6 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #949595 s active_color_1",
 "$	c #FFFFFF",
-"  ++++++++++++  ",
-" +@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@+",
-"+@@@@+$$$$+@@@@+",
-"+@@@+$$$$$$+@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@$$@$$@$$@@@+",
-"+@@@$$@$$@$$@@@+",
-"+@@@$$+@@+$$@@@+",
-"+@@@+$$$$$$+@@@+",
-"+@@@@+$$$$+@@@@+",
-"+@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@+ ",
-"  ++++++++++++  "};
+"  ++++++++++++++  ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@+$$$$$$+@@@@+",
+"+@@@@@+$$$$+@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+"  ++++++++++++++  "};
diff --git a/themes/default/themerc b/themes/default/themerc
index b671d9208d98dd6c06163631a47fb275ebce64ba..21e8332043f02b1c4ba496cb31938525e82d463a 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,6 +1,6 @@
 active_text_color=#ffffff
 button_offset=3
-button_spacing=3
+button_spacing=2
 full_width_title=true
 title_horizontal_offset=2
 title_vertical_offset_active=1
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index e2eccde15a77f4d3a7d772d325263244cbc0ea0c..3a4af88699ee267dc0034535417788a506c46626 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_active_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 37943fbe27e895dbef4a21414c2222cbb19f6844..9affc521e241dc4d10a356928746f5c4a407a638 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_inactive_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index e2eccde15a77f4d3a7d772d325263244cbc0ea0c..3a4af88699ee267dc0034535417788a506c46626 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_active_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 37943fbe27e895dbef4a21414c2222cbb19f6844..9affc521e241dc4d10a356928746f5c4a407a638 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_inactive_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index e2eccde15a77f4d3a7d772d325263244cbc0ea0c..3a4af88699ee267dc0034535417788a506c46626 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_active_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 37943fbe27e895dbef4a21414c2222cbb19f6844..9affc521e241dc4d10a356928746f5c4a407a638 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_inactive_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index e2eccde15a77f4d3a7d772d325263244cbc0ea0c..3a4af88699ee267dc0034535417788a506c46626 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_active_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 37943fbe27e895dbef4a21414c2222cbb19f6844..9affc521e241dc4d10a356928746f5c4a407a638 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_inactive_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index e2eccde15a77f4d3a7d772d325263244cbc0ea0c..3a4af88699ee267dc0034535417788a506c46626 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_active_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index a880745e82e74a0e13d80723b34387528ef34705..3ed1dd10ca1ea8d70b25696f52369968c138fff1 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 37943fbe27e895dbef4a21414c2222cbb19f6844..9affc521e241dc4d10a356928746f5c4a407a638 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_1_inactive_xpm[] = {
-"2 24 5 1",
+"2 25 5 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -28,5 +28,6 @@ static char * title_1_inactive_xpm[] = {
 "@@",
 "@@",
 "@@",
+"@@",
 "..",
 "##"};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 271096b30476caf8c8c32a6e3d75442a979f9e8a..04c2f36c24c3c92726cfca89bc5d5981670ae668 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index b59e62142938cd16a335630064af163c69e59a59..162020b9f8f03dcb71b4b9eab046b2d3088b75bb 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"9 24 9 1",
+"9 25 9 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -11,11 +11,14 @@ static char * top_left_active_xpm[] = {
 "&	c #6F82A3 s active_mid_1",
 "*	c #A39C97 s active_shadow_2",
 "        .",
-"      ..+",
-"     .&+#",
+"      ..&",
+"     .&##",
 "    .&###",
 "    .####",
-"***.&####",
+"   .&####",
+"   .#####",
+"   .#####",
+"***.#####",
 "*@@.#####",
 "*@%.#####",
 "*@%.#####",
@@ -24,8 +27,6 @@ static char * top_left_active_xpm[] = {
 "*@%.#####",
 "*@%.#####",
 "*@%.#####",
-"*@%.#####",
-"*@%.#####",
 "*@$.#####",
 "*@$.&####",
 "*@$*.####",
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 271096b30476caf8c8c32a6e3d75442a979f9e8a..04c2f36c24c3c92726cfca89bc5d5981670ae668 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 9203176a529b03f0ba532a1d796420f724e8914f..7a667b0c16df569e7adb00a0baa48038d0c7118b 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"9 24 9 1",
+"9 25 9 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -11,11 +11,14 @@ static char * top_left_inactive_xpm[] = {
 "&	c #6F82A3 s inactive_mid_1",
 "*	c #A39C97 s inactive_shadow_2",
 "        .",
-"      ..+",
-"     .&+#",
+"      ..&",
+"     .&##",
 "    .&###",
 "    .####",
-"***.&####",
+"   .&####",
+"   .#####",
+"   .#####",
+"***.#####",
 "*@@.#####",
 "*@%.#####",
 "*@%.#####",
@@ -24,8 +27,6 @@ static char * top_left_inactive_xpm[] = {
 "*@%.#####",
 "*@%.#####",
 "*@%.#####",
-"*@%.#####",
-"*@%.#####",
 "*@$.#####",
 "*@$.&####",
 "*@$*.####",
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index b51d5591d1d911947337c6642db4ff315bc10cb6..e023b705925d5e4e9072ccf82406af1a0842e3a6 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index bfb83b69f2104fb59baff6a33dc6eae2fad564b7..33c4a7845ad1b9e5a419ab1a47720f37e9f416a8 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"9 24 9 1",
+"9 25 9 1",
 " 	c None",
 ".	c #54637C s active_shadow_1",
 "+	c #9BB7E6 s active_hilight_1",
@@ -11,11 +11,14 @@ static char * top_right_active_xpm[] = {
 "&	c #6F82A3 s active_mid_1",
 "*	c #A39C97 s active_shadow_2",
 ".        ",
-"+..      ",
-"@+&.     ",
+"&..      ",
+"@@&.     ",
 "@@@&.    ",
 "@@@@.    ",
-"@@@@&.***",
+"@@@@&.   ",
+"@@@@@.   ",
+"@@@@@.   ",
+"@@@@@.***",
 "@@@@@.#$*",
 "@@@@@.%%*",
 "@@@@@.%%*",
@@ -25,8 +28,6 @@ static char * top_right_active_xpm[] = {
 "@@@@@.%%*",
 "@@@@@.%%*",
 "@@@@@.%%*",
-"@@@@@.%%*",
-"@@@@@.%%*",
 "@@@@&.%%*",
 "@@@@.*%%*",
 "@@@&.%%%*",
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index b51d5591d1d911947337c6642db4ff315bc10cb6..e023b705925d5e4e9072ccf82406af1a0842e3a6 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 202ad5727f16c1e85693b4bf8ab8b7a5c260745c..9bec10b2aa980316f43b0cf6637874283465c8d5 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"9 24 9 1",
+"9 25 9 1",
 " 	c None",
 ".	c #54637C s inactive_shadow_1",
 "+	c #9BB7E6 s inactive_hilight_1",
@@ -11,11 +11,14 @@ static char * top_right_inactive_xpm[] = {
 "&	c #6F82A3 s inactive_mid_1",
 "*	c #A39C97 s inactive_shadow_2",
 ".        ",
-"+..      ",
-"@+&.     ",
+"&..      ",
+"@@&.     ",
 "@@@&.    ",
 "@@@@.    ",
-"@@@@&.***",
+"@@@@&.   ",
+"@@@@@.   ",
+"@@@@@.   ",
+"@@@@@.***",
 "@@@@@.#$*",
 "@@@@@.%%*",
 "@@@@@.%%*",
@@ -25,8 +28,6 @@ static char * top_right_inactive_xpm[] = {
 "@@@@@.%%*",
 "@@@@@.%%*",
 "@@@@@.%%*",
-"@@@@@.%%*",
-"@@@@@.%%*",
 "@@@@&.%%*",
 "@@@@.*%%*",
 "@@@&.%%%*",