diff --git a/configure b/configure
index 916594f311de0ca6f77b7d31b363971df9da7e87..527b47dc07702422b7af3fceb02a090603e8ea1c 100755
--- a/configure
+++ b/configure
@@ -1822,7 +1822,7 @@ fi
# Define the identity of the package.
PACKAGE=xfwm4
- VERSION=4.1.5
+ VERSION=4.1.6
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 68d6707e77c4ac7e052602513d83dd33171b6a1a..5833c3d1d2694ecbf7618e0b5bca7bfc24b71b81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([src/main.c])
AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE([xfwm4], [4.1.5])
+AM_INIT_AUTOMAKE([xfwm4], [4.1.6])
AM_CONFIG_HEADER([config.h])
diff --git a/doc/C/images/compose_shortcut.png b/doc/C/images/compose_shortcut.png
index 0dbd3bddc7648bcb9f05070b450dac4c94b93920..0d901d8eb2dcd21c3454b16a14851c3a13a65b45 100644
Binary files a/doc/C/images/compose_shortcut.png and b/doc/C/images/compose_shortcut.png differ
diff --git a/doc/C/images/decoration_style.png b/doc/C/images/decoration_style.png
index 1560e9988f80e37081f3c2c83380e644642a827e..5b419a9edc7f804db57c62b6a728bfd43f3877d5 100644
Binary files a/doc/C/images/decoration_style.png and b/doc/C/images/decoration_style.png differ
diff --git a/doc/C/images/focus.png b/doc/C/images/focus.png
index bd6c424631908ba816ee226c881b99c07913e3d1..6b3b3782e5970fe7f26280cf3ee8f7cf05007670 100644
Binary files a/doc/C/images/focus.png and b/doc/C/images/focus.png differ
diff --git a/doc/C/images/keyboard_shortcuts.png b/doc/C/images/keyboard_shortcuts.png
index a6965414affdde3a890bc154815b329250d00ddb..685a63efff551d1a472a9ddaf8e15be6b9522607 100644
Binary files a/doc/C/images/keyboard_shortcuts.png and b/doc/C/images/keyboard_shortcuts.png differ
diff --git a/doc/C/images/misc_wm_prefs.png b/doc/C/images/misc_wm_prefs.png
index 77414f9e84842740d499a0dd533888144d7eeb67..a64002a8fd839601c1c510f86dc1d6077e35b883 100644
Binary files a/doc/C/images/misc_wm_prefs.png and b/doc/C/images/misc_wm_prefs.png differ
diff --git a/doc/C/images/workspace_margins.png b/doc/C/images/workspace_margins.png
index 0cab60cc7ecac81e5c34bdb3239541884066c60a..1becc8774d0d05805ff2ee1642c830cd7c5df59b 100644
Binary files a/doc/C/images/workspace_margins.png and b/doc/C/images/workspace_margins.png differ
diff --git a/doc/C/images/xfwm_workspaces.png b/doc/C/images/xfwm_workspaces.png
index 323802754cbfdf9d16c01b2eeed74704579f79b5..17a8651d1771872f29a042dc613e2b901ccd2104 100644
Binary files a/doc/C/images/xfwm_workspaces.png and b/doc/C/images/xfwm_workspaces.png differ
diff --git a/ltmain.sh b/ltmain.sh
index c13e957f7632ac72cff76850db23e4bd0d6e9afa..23f82e3b79cf555dc49c69f5ec241a587987918e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -33,6 +33,9 @@ basename="s,^.*/,,g"
# function.
progpath="$0"
+# RH: define SED for historic ltconfig's generated by Libtool 1.3
+[ -z "$SED" ] && SED=sed
+
# The name of this program:
progname=`echo "$progpath" | $SED $basename`
modename="$progname"
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 5511a575d72712b3f7f8982ade0f4af0a8934628..4d6e285268233fd91b82cfd067d92ead5f4b7464 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-15 23:28+0200\n"
+"POT-Creation-Date: 2004-08-17 00:03+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"
@@ -544,7 +544,7 @@ msgstr ""
msgid "Compose shortcut for command :"
msgstr ""
-#: src/events.c:1627
+#: src/events.c:1626
#, c-format
msgid "%s: Operation not supported (yet)\n"
msgstr ""
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index bb61253093ead0d947968f15d313e089e171050d..afbd238b16b07f8d0143315c92ed4f3ffabecc60 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * close_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 8686292098eaa33c434099584851c2e157affcdf..d0ed64f22b659040c7d3379d48cf97e1ea99cf04 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 1196141bf23759a2338a8e744b3b5b4e24da5800..5987faf9c38a49ed210e29123883ed5b2c115b47 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * hide_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 9dfdfdd38a96ba99a0c107ee81fa722afe55d8cc..80b1179c9832929989a2baffd63b1947d79b028f 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 f659049b9cd7dca35356831d7ba6a9b38d2cf9e1..d9ff03c1d6d017bb24cd435b7be4d043e0ec5ede 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index c962c1fa6c4d1594ed266e393b2757f7161e46ff..66a96d11b91a229aae5e2ad83d04497ae2b55b63 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 edfb7357645cfa397b6189e88609d9f691b0b3c5..ebb8a01e9271ff53f383e06f2269ec7babfc348c 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 911c4421c976fdebbb63829d8ca8d624018e1d55..3e2e87d390e58fffe015d9095b9bf16ccb4ce237 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -8,19 +8,19 @@ static char * maximize_toggled_pressed_xpm[] = {
"# c #FFFFFF",
" ++++++++++++++ ",
" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@#####@@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@##@@@+",
-"+@@@@#####@@##@@@+",
-"+@@@#######@##@@@+",
-"+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#@@@@+",
-"+@@@##@@@##@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@@#####@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-" ++++++++++++++ "};
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@#####@@@+",
+"+@@@@@#######@@+",
+"+@@@@@@@@@@##@@+",
+"+@@@#####@@##@@+",
+"+@@#######@##@@+",
+"+@@##@@@##@##@@+",
+"+@@##@@@##@#@@@+",
+"+@@##@@@##@@@@@+",
+"+@@#######@@@@@+",
+"+@@@#####@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@+ ",
+" ++++++++++++ "};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index d2a330dd3a45533b317401e161ed52900afd9d10..36d5757758f9b523103ee17c602bfa683e5df668 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * menu_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index a7843129926f39d66953c1eb3e7a8435441f6b1b..c60ab58be084ce5edee83fdf0d1b33b59ba17389 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 e66807828476260293cb8b5b882a8408f11c6a1a..0bb06012315998ce09aea073de57ab2ae646c3a1 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index da33f3ec010ca59adc56a9362b45f7ab508d06ec..43dc27ec81506dde562e685c8c617a93de67a9b6 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 481b813e566debe6c89f509226dda1ffb2f78a53..43aad80ebc5b068ee12ec41a7c833cef28115106 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"18 18 5 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index a2208945c8770137d640e291ec3057bb3235a175..dfe1b4e6be7c4873fdcf39a42766e7fd2a6a8adb 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"18 18 5 1",
+"16 16 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 3ad7fca9b9f207fe7289789cf3bb2835f4d5b1fd..5dd0f6a0690069a3810e3bcba885b7ad86f7dc96 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,27 +1,25 @@
/* XPM */
static char * stick_active_xpm[] = {
-"18 18 6 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 0224da6b44867831a2cbaa35f7cded4acb96e851..3b07f29d15a6dc238d96f558073ee28563ec37c3 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,27 +1,25 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"18 18 6 1",
+"16 16 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 23042008352ab1b66782dd934e9bdbaf8008f3e8..1877dad22b391dbc0886d38bf60e9ac40d1bd2de 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,27 +1,25 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"18 18 6 1",
+"16 16 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 1b9ea5a24df7916fc0a12ee00fd05eced3bd3ca9..2da7d963d77a1868ce20e71d50b22de049dc22b1 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,22 +1,5 @@
/* XPM */
static char * bouton_inactive_xpm[] = {
-"1 18 1 1",
+"1 1 1 1",
" c None",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
" "};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 3d40893635b79034566a6cec7fb76442724d675a..12dcd8f4b36e0ff1e25c8724af806434dbc1aa0d 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,27 +1,25 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"18 18 6 1",
+"16 16 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 21e8332043f02b1c4ba496cb31938525e82d463a..b671d9208d98dd6c06163631a47fb275ebce64ba 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,6 +1,6 @@
active_text_color=#ffffff
button_offset=3
-button_spacing=2
+button_spacing=3
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 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 3a4af88699ee267dc0034535417788a506c46626..e2eccde15a77f4d3a7d772d325263244cbc0ea0c 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_active_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 9affc521e241dc4d10a356928746f5c4a407a638..37943fbe27e895dbef4a21414c2222cbb19f6844 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_inactive_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 3a4af88699ee267dc0034535417788a506c46626..e2eccde15a77f4d3a7d772d325263244cbc0ea0c 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_active_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 9affc521e241dc4d10a356928746f5c4a407a638..37943fbe27e895dbef4a21414c2222cbb19f6844 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_inactive_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 3a4af88699ee267dc0034535417788a506c46626..e2eccde15a77f4d3a7d772d325263244cbc0ea0c 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_active_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 9affc521e241dc4d10a356928746f5c4a407a638..37943fbe27e895dbef4a21414c2222cbb19f6844 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_inactive_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 3a4af88699ee267dc0034535417788a506c46626..e2eccde15a77f4d3a7d772d325263244cbc0ea0c 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_active_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 9affc521e241dc4d10a356928746f5c4a407a638..37943fbe27e895dbef4a21414c2222cbb19f6844 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_inactive_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 3a4af88699ee267dc0034535417788a506c46626..e2eccde15a77f4d3a7d772d325263244cbc0ea0c 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_active_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index 24b61e5860164efae27879d1de09ed29d0470969..1dd4c8c201b3eb429bdf33283db3dd99b8b78786 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 9affc521e241dc4d10a356928746f5c4a407a638..37943fbe27e895dbef4a21414c2222cbb19f6844 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 25 5 1",
+"2 24 5 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -28,6 +28,5 @@ static char * title_1_inactive_xpm[] = {
"@@",
"@@",
"@@",
-"@@",
"..",
"##"};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index f6d559b2d1067c13b2b5d79a946221de245f4f99..6f9f28a8a669a6a33442c444f304eb7911cf578a 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 48bd3901ce3a52f158a1c84430cb2b264c4ef83e..b59e62142938cd16a335630064af163c69e59a59 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 25 9 1",
+"9 24 9 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -11,13 +11,12 @@ static char * top_left_active_xpm[] = {
"& c #6F82A3 s active_mid_1",
"* c #A39C97 s active_shadow_2",
" .",
-"******..+",
-"*@@@@.&+#",
-"*@$$.&###",
-"*@$$.####",
-"*@$.&####",
-"*@$.#####",
-"*@%.#####",
+" ..+",
+" .&+#",
+" .&###",
+" .####",
+"***.&####",
+"*@@.#####",
"*@%.#####",
"*@%.#####",
"*@%.#####",
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index f6d559b2d1067c13b2b5d79a946221de245f4f99..76c43490628176a4925dac0e5efcbf0b08e53172 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 b25f6f42d0f8b7603df1a228e37ba2bec11c6220..9203176a529b03f0ba532a1d796420f724e8914f 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 25 9 1",
+"9 24 9 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -11,13 +11,12 @@ static char * top_left_inactive_xpm[] = {
"& c #6F82A3 s inactive_mid_1",
"* c #A39C97 s inactive_shadow_2",
" .",
-"******..+",
-"*@@@@.&+#",
-"*@$$.&###",
-"*@$$.####",
-"*@$.&####",
-"*@$.#####",
-"*@%.#####",
+" ..+",
+" .&+#",
+" .&###",
+" .####",
+"***.&####",
+"*@@.#####",
"*@%.#####",
"*@%.#####",
"*@%.#####",
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 8512d6d54ba73303627fe8d967006cb37b4215e3..37f2df351afd9209cf8da27e1527faf578c5c08d 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 ce40777f992d1050ae7757c76e7c17bb82053f0f..bfb83b69f2104fb59baff6a33dc6eae2fad564b7 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 25 9 1",
+"9 24 9 1",
" c None",
". c #54637C s active_shadow_1",
"+ c #9BB7E6 s active_hilight_1",
@@ -11,13 +11,12 @@ static char * top_right_active_xpm[] = {
"& c #6F82A3 s active_mid_1",
"* c #A39C97 s active_shadow_2",
". ",
-"+..******",
-"@+&.###$*",
-"@@@&.$%%*",
-"@@@@.$%%*",
-"@@@@&.%%*",
-"@@@@@.%%*",
-"@@@@@.%%*",
+"+.. ",
+"@+&. ",
+"@@@&. ",
+"@@@@. ",
+"@@@@&.***",
+"@@@@@.#$*",
"@@@@@.%%*",
"@@@@@.%%*",
"@@@@@.%%*",
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index 8512d6d54ba73303627fe8d967006cb37b4215e3..dfe26954a369b1768859e915b0c5b4bdb4942eb1 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 b7c177833d514f6bfa531811bdb40be2f65d532c..202ad5727f16c1e85693b4bf8ab8b7a5c260745c 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 25 9 1",
+"9 24 9 1",
" c None",
". c #54637C s inactive_shadow_1",
"+ c #9BB7E6 s inactive_hilight_1",
@@ -11,13 +11,12 @@ static char * top_right_inactive_xpm[] = {
"& c #6F82A3 s inactive_mid_1",
"* c #A39C97 s inactive_shadow_2",
". ",
-"+..******",
-"@+&.###$*",
-"@@@&.$%%*",
-"@@@@.$%%*",
-"@@@@&.%%*",
-"@@@@@.%%*",
-"@@@@@.%%*",
+"+.. ",
+"@+&. ",
+"@@@&. ",
+"@@@@. ",
+"@@@@&.***",
+"@@@@@.#$*",
"@@@@@.%%*",
"@@@@@.%%*",
"@@@@@.%%*",