[Xfce4-commits] [xfce/xfwm4] 02/02: Add new default themes

noreply at xfce.org noreply at xfce.org
Tue Dec 9 21:43:41 CET 2014


This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 70f006cc8d56d3e1fb76b28b9d01c3fcafe7564b
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Oct 15 22:38:59 2014 +0100

    Add new default themes
    
    To better integrate with GTK3/GNOME apps.
    Also include hdpi and xhdpi variants.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 configure.ac.in                                    |    2 +
 themes/Makefile.am                                 |    2 +
 themes/daloa/Makefile.am                           |    2 +-
 themes/{kokodi => default-hdpi}/Makefile.am        |    4 +-
 themes/default-hdpi/README                         |    4 +
 themes/default-hdpi/bottom-active.png              |  Bin 0 -> 100 bytes
 themes/default-hdpi/bottom-active.svg              |  123 ++++++
 themes/default-hdpi/bottom-active.xpm              |   12 +
 themes/default-hdpi/bottom-inactive.png            |  Bin 0 -> 100 bytes
 themes/default-hdpi/bottom-inactive.svg            |  123 ++++++
 themes/default-hdpi/bottom-inactive.xpm            |   12 +
 themes/default-hdpi/bottom-left-active.png         |  Bin 0 -> 150 bytes
 themes/default-hdpi/bottom-left-active.svg         |  122 ++++++
 themes/default-hdpi/bottom-left-active.xpm         |   30 ++
 themes/default-hdpi/bottom-left-inactive.png       |  Bin 0 -> 150 bytes
 themes/default-hdpi/bottom-left-inactive.svg       |  122 ++++++
 themes/default-hdpi/bottom-left-inactive.xpm       |   30 ++
 themes/default-hdpi/bottom-right-active.png        |  Bin 0 -> 149 bytes
 themes/default-hdpi/bottom-right-active.svg        |  122 ++++++
 themes/default-hdpi/bottom-right-active.xpm        |   30 ++
 themes/default-hdpi/bottom-right-inactive.png      |  Bin 0 -> 149 bytes
 themes/default-hdpi/bottom-right-inactive.svg      |  122 ++++++
 themes/default-hdpi/bottom-right-inactive.xpm      |   30 ++
 themes/default-hdpi/close-active.png               |  Bin 0 -> 1295 bytes
 themes/default-hdpi/close-active.svg               |  223 +++++++++++
 themes/default-hdpi/close-active.xpm               |   48 +++
 themes/default-hdpi/close-inactive.png             |  Bin 0 -> 833 bytes
 themes/default-hdpi/close-inactive.svg             |  181 +++++++++
 themes/default-hdpi/close-inactive.xpm             |   48 +++
 themes/default-hdpi/close-prelight.png             |  Bin 0 -> 1860 bytes
 themes/default-hdpi/close-prelight.svg             |  241 ++++++++++++
 themes/default-hdpi/close-prelight.xpm             |   48 +++
 themes/default-hdpi/close-pressed.png              |  Bin 0 -> 2010 bytes
 themes/default-hdpi/close-pressed.svg              |  241 ++++++++++++
 themes/default-hdpi/close-pressed.xpm              |   48 +++
 themes/default-hdpi/hide-active.png                |  Bin 0 -> 388 bytes
 themes/default-hdpi/hide-active.svg                |  217 +++++++++++
 themes/default-hdpi/hide-active.xpm                |   48 +++
 themes/default-hdpi/hide-inactive.png              |  Bin 0 -> 214 bytes
 themes/default-hdpi/hide-inactive.svg              |  181 +++++++++
 themes/default-hdpi/hide-inactive.xpm              |   48 +++
 themes/default-hdpi/hide-prelight.png              |  Bin 0 -> 895 bytes
 themes/default-hdpi/hide-prelight.svg              |  235 ++++++++++++
 themes/default-hdpi/hide-prelight.xpm              |   48 +++
 themes/default-hdpi/hide-pressed.png               |  Bin 0 -> 869 bytes
 themes/default-hdpi/hide-pressed.svg               |  235 ++++++++++++
 themes/default-hdpi/hide-pressed.xpm               |   48 +++
 themes/default-hdpi/left-active.png                |  Bin 0 -> 104 bytes
 themes/default-hdpi/left-active.svg                |  121 ++++++
 themes/default-hdpi/left-active.xpm                |   38 ++
 themes/default-hdpi/left-inactive.png              |  Bin 0 -> 104 bytes
 themes/default-hdpi/left-inactive.svg              |  121 ++++++
 themes/default-hdpi/left-inactive.xpm              |   38 ++
 themes/default-hdpi/maximize-active.png            |  Bin 0 -> 596 bytes
 themes/default-hdpi/maximize-active.svg            |  211 ++++++++++
 themes/default-hdpi/maximize-active.xpm            |   48 +++
 themes/default-hdpi/maximize-inactive.png          |  Bin 0 -> 350 bytes
 themes/default-hdpi/maximize-inactive.svg          |  178 +++++++++
 themes/default-hdpi/maximize-inactive.xpm          |   48 +++
 themes/default-hdpi/maximize-prelight.png          |  Bin 0 -> 1052 bytes
 themes/default-hdpi/maximize-prelight.svg          |  229 +++++++++++
 themes/default-hdpi/maximize-prelight.xpm          |   48 +++
 themes/default-hdpi/maximize-pressed.png           |  Bin 0 -> 1082 bytes
 themes/default-hdpi/maximize-pressed.svg           |  229 +++++++++++
 themes/default-hdpi/maximize-pressed.xpm           |   48 +++
 themes/default-hdpi/maximize-toggled-active.png    |  Bin 0 -> 751 bytes
 themes/default-hdpi/maximize-toggled-active.svg    |  215 +++++++++++
 themes/default-hdpi/maximize-toggled-active.xpm    |   48 +++
 themes/default-hdpi/maximize-toggled-inactive.png  |  Bin 0 -> 446 bytes
 themes/default-hdpi/maximize-toggled-inactive.svg  |  182 +++++++++
 themes/default-hdpi/maximize-toggled-inactive.xpm  |   48 +++
 themes/default-hdpi/maximize-toggled-prelight.png  |  Bin 0 -> 1154 bytes
 themes/default-hdpi/maximize-toggled-prelight.svg  |  233 +++++++++++
 themes/default-hdpi/maximize-toggled-prelight.xpm  |   48 +++
 themes/default-hdpi/maximize-toggled-pressed.png   |  Bin 0 -> 1230 bytes
 themes/default-hdpi/maximize-toggled-pressed.svg   |  233 +++++++++++
 themes/default-hdpi/maximize-toggled-pressed.xpm   |   48 +++
 themes/default-hdpi/menu-active.png                |  Bin 0 -> 167 bytes
 themes/default-hdpi/menu-active.svg                |  164 ++++++++
 themes/default-hdpi/menu-active.xpm                |   48 +++
 themes/default-hdpi/menu-inactive.png              |  Bin 0 -> 167 bytes
 themes/default-hdpi/menu-inactive.svg              |  164 ++++++++
 themes/default-hdpi/menu-inactive.xpm              |   48 +++
 themes/default-hdpi/menu-prelight.png              |  Bin 0 -> 167 bytes
 themes/default-hdpi/menu-prelight.svg              |  164 ++++++++
 themes/default-hdpi/menu-prelight.xpm              |   48 +++
 themes/default-hdpi/menu-pressed.png               |  Bin 0 -> 167 bytes
 themes/default-hdpi/menu-pressed.svg               |  164 ++++++++
 themes/default-hdpi/menu-pressed.xpm               |   48 +++
 themes/default-hdpi/right-active.png               |  Bin 0 -> 106 bytes
 themes/default-hdpi/right-active.svg               |  121 ++++++
 themes/default-hdpi/right-active.xpm               |   38 ++
 themes/default-hdpi/right-inactive.png             |  Bin 0 -> 106 bytes
 themes/default-hdpi/right-inactive.svg             |  121 ++++++
 themes/default-hdpi/right-inactive.xpm             |   38 ++
 themes/default-hdpi/shade-active.png               |  Bin 0 -> 904 bytes
 themes/default-hdpi/shade-active.svg               |  211 ++++++++++
 themes/default-hdpi/shade-active.xpm               |   48 +++
 themes/default-hdpi/shade-inactive.png             |  Bin 0 -> 521 bytes
 themes/default-hdpi/shade-inactive.svg             |  178 +++++++++
 themes/default-hdpi/shade-inactive.xpm             |   48 +++
 themes/default-hdpi/shade-prelight.png             |  Bin 0 -> 1332 bytes
 themes/default-hdpi/shade-prelight.svg             |  229 +++++++++++
 themes/default-hdpi/shade-prelight.xpm             |   48 +++
 themes/default-hdpi/shade-pressed.png              |  Bin 0 -> 1381 bytes
 themes/default-hdpi/shade-pressed.svg              |  229 +++++++++++
 themes/default-hdpi/shade-pressed.xpm              |   48 +++
 themes/default-hdpi/shade-toggled-active.png       |  Bin 0 -> 906 bytes
 themes/default-hdpi/shade-toggled-active.svg       |  211 ++++++++++
 themes/default-hdpi/shade-toggled-active.xpm       |   48 +++
 themes/default-hdpi/shade-toggled-inactive.png     |  Bin 0 -> 529 bytes
 themes/default-hdpi/shade-toggled-inactive.svg     |  178 +++++++++
 themes/default-hdpi/shade-toggled-inactive.xpm     |   48 +++
 themes/default-hdpi/shade-toggled-prelight.png     |  Bin 0 -> 1328 bytes
 themes/default-hdpi/shade-toggled-prelight.svg     |  229 +++++++++++
 themes/default-hdpi/shade-toggled-prelight.xpm     |   48 +++
 themes/default-hdpi/shade-toggled-pressed.png      |  Bin 0 -> 1336 bytes
 themes/default-hdpi/shade-toggled-pressed.svg      |  229 +++++++++++
 themes/default-hdpi/shade-toggled-pressed.xpm      |   48 +++
 themes/default-hdpi/stick-active.png               |  Bin 0 -> 1022 bytes
 themes/default-hdpi/stick-active.svg               |  211 ++++++++++
 themes/default-hdpi/stick-active.xpm               |   48 +++
 themes/default-hdpi/stick-inactive.png             |  Bin 0 -> 642 bytes
 themes/default-hdpi/stick-inactive.svg             |  178 +++++++++
 themes/default-hdpi/stick-inactive.xpm             |   48 +++
 themes/default-hdpi/stick-prelight.png             |  Bin 0 -> 1481 bytes
 themes/default-hdpi/stick-prelight.svg             |  229 +++++++++++
 themes/default-hdpi/stick-prelight.xpm             |   48 +++
 themes/default-hdpi/stick-pressed.png              |  Bin 0 -> 1481 bytes
 themes/default-hdpi/stick-pressed.svg              |  229 +++++++++++
 themes/default-hdpi/stick-pressed.xpm              |   48 +++
 themes/default-hdpi/stick-toggled-active.png       |  Bin 0 -> 1029 bytes
 themes/default-hdpi/stick-toggled-active.svg       |  220 +++++++++++
 themes/default-hdpi/stick-toggled-active.xpm       |   48 +++
 themes/default-hdpi/stick-toggled-inactive.png     |  Bin 0 -> 701 bytes
 themes/default-hdpi/stick-toggled-inactive.svg     |  187 +++++++++
 themes/default-hdpi/stick-toggled-inactive.xpm     |   48 +++
 themes/default-hdpi/stick-toggled-prelight.png     |  Bin 0 -> 1503 bytes
 themes/default-hdpi/stick-toggled-prelight.svg     |  238 ++++++++++++
 themes/default-hdpi/stick-toggled-prelight.xpm     |   48 +++
 themes/default-hdpi/stick-toggled-pressed.png      |  Bin 0 -> 1482 bytes
 themes/default-hdpi/stick-toggled-pressed.svg      |  238 ++++++++++++
 themes/default-hdpi/stick-toggled-pressed.xpm      |   48 +++
 themes/default-hdpi/themerc                        |   14 +
 themes/default-hdpi/title-1-active.png             |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-1-active.svg             |  164 ++++++++
 themes/default-hdpi/title-1-active.xpm             |   48 +++
 themes/default-hdpi/title-1-inactive.png           |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-1-inactive.svg           |  164 ++++++++
 themes/default-hdpi/title-1-inactive.xpm           |   48 +++
 themes/default-hdpi/title-2-active.png             |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-2-active.svg             |  164 ++++++++
 themes/default-hdpi/title-2-active.xpm             |   48 +++
 themes/default-hdpi/title-2-inactive.png           |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-2-inactive.svg           |  164 ++++++++
 themes/default-hdpi/title-2-inactive.xpm           |   48 +++
 themes/default-hdpi/title-3-active.png             |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-3-active.svg             |  164 ++++++++
 themes/default-hdpi/title-3-active.xpm             |   48 +++
 themes/default-hdpi/title-3-inactive.png           |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-3-inactive.svg           |  164 ++++++++
 themes/default-hdpi/title-3-inactive.xpm           |   48 +++
 themes/default-hdpi/title-4-active.png             |  Bin 0 -> 428 bytes
 themes/default-hdpi/title-4-active.svg             |  193 ++++++++++
 themes/default-hdpi/title-4-active.xpm             |   48 +++
 themes/default-hdpi/title-4-inactive.png           |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-4-inactive.svg           |  164 ++++++++
 themes/default-hdpi/title-4-inactive.xpm           |   48 +++
 themes/default-hdpi/title-5-active.png             |  Bin 0 -> 228 bytes
 themes/default-hdpi/title-5-active.svg             |  193 ++++++++++
 themes/default-hdpi/title-5-active.xpm             |   48 +++
 themes/default-hdpi/title-5-inactive.png           |  Bin 0 -> 145 bytes
 themes/default-hdpi/title-5-inactive.svg           |  164 ++++++++
 themes/default-hdpi/title-5-inactive.xpm           |   48 +++
 themes/default-hdpi/top-left-active.png            |  Bin 0 -> 357 bytes
 themes/default-hdpi/top-left-active.svg            |  161 ++++++++
 themes/default-hdpi/top-left-active.xpm            |   48 +++
 themes/default-hdpi/top-left-inactive.png          |  Bin 0 -> 357 bytes
 themes/default-hdpi/top-left-inactive.svg          |  161 ++++++++
 themes/default-hdpi/top-left-inactive.xpm          |   48 +++
 themes/default-hdpi/top-right-active.png           |  Bin 0 -> 439 bytes
 themes/default-hdpi/top-right-active.svg           |  193 ++++++++++
 themes/default-hdpi/top-right-active.xpm           |   48 +++
 themes/default-hdpi/top-right-inactive.png         |  Bin 0 -> 411 bytes
 themes/default-hdpi/top-right-inactive.svg         |  161 ++++++++
 themes/default-hdpi/top-right-inactive.xpm         |   48 +++
 themes/{kokodi => default-xhdpi}/Makefile.am       |    4 +-
 themes/default-xhdpi/README                        |    4 +
 themes/default-xhdpi/bottom-active.png             |  Bin 0 -> 112 bytes
 themes/default-xhdpi/bottom-active.svg             |  105 +++++
 themes/default-xhdpi/bottom-active.xpm             |   18 +
 themes/default-xhdpi/bottom-inactive.png           |  Bin 0 -> 112 bytes
 themes/default-xhdpi/bottom-inactive.svg           |  105 +++++
 themes/default-xhdpi/bottom-inactive.xpm           |   18 +
 themes/default-xhdpi/bottom-left-active.png        |  Bin 0 -> 174 bytes
 themes/default-xhdpi/bottom-left-active.svg        |  104 +++++
 themes/default-xhdpi/bottom-left-active.xpm        |   38 ++
 themes/default-xhdpi/bottom-left-inactive.png      |  Bin 0 -> 174 bytes
 themes/default-xhdpi/bottom-left-inactive.svg      |  104 +++++
 themes/default-xhdpi/bottom-left-inactive.xpm      |   38 ++
 themes/default-xhdpi/bottom-right-active.png       |  Bin 0 -> 159 bytes
 themes/default-xhdpi/bottom-right-active.svg       |  104 +++++
 themes/default-xhdpi/bottom-right-active.xpm       |   38 ++
 themes/default-xhdpi/bottom-right-inactive.png     |  Bin 0 -> 159 bytes
 themes/default-xhdpi/bottom-right-inactive.svg     |  104 +++++
 themes/default-xhdpi/bottom-right-inactive.xpm     |   38 ++
 themes/default-xhdpi/close-active.png              |  Bin 0 -> 1681 bytes
 themes/default-xhdpi/close-active.svg              |  223 +++++++++++
 themes/default-xhdpi/close-active.xpm              |   62 +++
 themes/default-xhdpi/close-inactive.png            |  Bin 0 -> 974 bytes
 themes/default-xhdpi/close-inactive.svg            |  181 +++++++++
 themes/default-xhdpi/close-inactive.xpm            |   62 +++
 themes/default-xhdpi/close-prelight.png            |  Bin 0 -> 2286 bytes
 themes/default-xhdpi/close-prelight.svg            |  241 ++++++++++++
 themes/default-xhdpi/close-prelight.xpm            |   62 +++
 themes/default-xhdpi/close-pressed.png             |  Bin 0 -> 2420 bytes
 themes/default-xhdpi/close-pressed.svg             |  241 ++++++++++++
 themes/default-xhdpi/close-pressed.xpm             |   62 +++
 themes/default-xhdpi/hide-active.png               |  Bin 0 -> 365 bytes
 themes/default-xhdpi/hide-active.svg               |  217 +++++++++++
 themes/default-xhdpi/hide-active.xpm               |   62 +++
 themes/default-xhdpi/hide-inactive.png             |  Bin 0 -> 219 bytes
 themes/default-xhdpi/hide-inactive.svg             |  181 +++++++++
 themes/default-xhdpi/hide-inactive.xpm             |   62 +++
 themes/default-xhdpi/hide-prelight.png             |  Bin 0 -> 1007 bytes
 themes/default-xhdpi/hide-prelight.svg             |  235 ++++++++++++
 themes/default-xhdpi/hide-prelight.xpm             |   62 +++
 themes/default-xhdpi/hide-pressed.png              |  Bin 0 -> 945 bytes
 themes/default-xhdpi/hide-pressed.svg              |  235 ++++++++++++
 themes/default-xhdpi/hide-pressed.xpm              |   62 +++
 themes/default-xhdpi/left-active.png               |  Bin 0 -> 114 bytes
 themes/default-xhdpi/left-active.svg               |  103 +++++
 themes/default-xhdpi/left-active.xpm               |   54 +++
 themes/default-xhdpi/left-inactive.png             |  Bin 0 -> 114 bytes
 themes/default-xhdpi/left-inactive.svg             |  103 +++++
 themes/default-xhdpi/left-inactive.xpm             |   54 +++
 themes/default-xhdpi/maximize-active.png           |  Bin 0 -> 501 bytes
 themes/default-xhdpi/maximize-active.svg           |  211 ++++++++++
 themes/default-xhdpi/maximize-active.xpm           |   62 +++
 themes/default-xhdpi/maximize-inactive.png         |  Bin 0 -> 303 bytes
 themes/default-xhdpi/maximize-inactive.svg         |  178 +++++++++
 themes/default-xhdpi/maximize-inactive.xpm         |   62 +++
 themes/default-xhdpi/maximize-prelight.png         |  Bin 0 -> 1142 bytes
 themes/default-xhdpi/maximize-prelight.svg         |  229 +++++++++++
 themes/default-xhdpi/maximize-prelight.xpm         |   62 +++
 themes/default-xhdpi/maximize-pressed.png          |  Bin 0 -> 1087 bytes
 themes/default-xhdpi/maximize-pressed.svg          |  229 +++++++++++
 themes/default-xhdpi/maximize-pressed.xpm          |   62 +++
 themes/default-xhdpi/maximize-toggled-active.png   |  Bin 0 -> 622 bytes
 themes/default-xhdpi/maximize-toggled-active.svg   |  215 +++++++++++
 themes/default-xhdpi/maximize-toggled-active.xpm   |   62 +++
 themes/default-xhdpi/maximize-toggled-inactive.png |  Bin 0 -> 400 bytes
 themes/default-xhdpi/maximize-toggled-inactive.svg |  182 +++++++++
 themes/default-xhdpi/maximize-toggled-inactive.xpm |   62 +++
 themes/default-xhdpi/maximize-toggled-prelight.png |  Bin 0 -> 1232 bytes
 themes/default-xhdpi/maximize-toggled-prelight.svg |  233 +++++++++++
 themes/default-xhdpi/maximize-toggled-prelight.xpm |   62 +++
 themes/default-xhdpi/maximize-toggled-pressed.png  |  Bin 0 -> 1165 bytes
 themes/default-xhdpi/maximize-toggled-pressed.svg  |  233 +++++++++++
 themes/default-xhdpi/maximize-toggled-pressed.xpm  |   62 +++
 themes/default-xhdpi/menu-active.png               |  Bin 0 -> 187 bytes
 themes/default-xhdpi/menu-active.svg               |  164 ++++++++
 themes/default-xhdpi/menu-active.xpm               |   62 +++
 themes/default-xhdpi/menu-inactive.png             |  Bin 0 -> 187 bytes
 themes/default-xhdpi/menu-inactive.svg             |  164 ++++++++
 themes/default-xhdpi/menu-inactive.xpm             |   62 +++
 themes/default-xhdpi/menu-prelight.png             |  Bin 0 -> 187 bytes
 themes/default-xhdpi/menu-prelight.svg             |  164 ++++++++
 themes/default-xhdpi/menu-prelight.xpm             |   62 +++
 themes/default-xhdpi/menu-pressed.png              |  Bin 0 -> 187 bytes
 themes/default-xhdpi/menu-pressed.svg              |  164 ++++++++
 themes/default-xhdpi/menu-pressed.xpm              |   62 +++
 themes/default-xhdpi/right-active.png              |  Bin 0 -> 114 bytes
 themes/default-xhdpi/right-active.svg              |  103 +++++
 themes/default-xhdpi/right-active.xpm              |   54 +++
 themes/default-xhdpi/right-inactive.png            |  Bin 0 -> 114 bytes
 themes/default-xhdpi/right-inactive.svg            |  103 +++++
 themes/default-xhdpi/right-inactive.xpm            |   54 +++
 themes/default-xhdpi/shade-active.png              |  Bin 0 -> 1141 bytes
 themes/default-xhdpi/shade-active.svg              |  211 ++++++++++
 themes/default-xhdpi/shade-active.xpm              |   62 +++
 themes/default-xhdpi/shade-inactive.png            |  Bin 0 -> 592 bytes
 themes/default-xhdpi/shade-inactive.svg            |  178 +++++++++
 themes/default-xhdpi/shade-inactive.xpm            |   62 +++
 themes/default-xhdpi/shade-prelight.png            |  Bin 0 -> 1650 bytes
 themes/default-xhdpi/shade-prelight.svg            |  229 +++++++++++
 themes/default-xhdpi/shade-prelight.xpm            |   62 +++
 themes/default-xhdpi/shade-pressed.png             |  Bin 0 -> 1698 bytes
 themes/default-xhdpi/shade-pressed.svg             |  229 +++++++++++
 themes/default-xhdpi/shade-pressed.xpm             |   62 +++
 themes/default-xhdpi/shade-toggled-active.png      |  Bin 0 -> 1170 bytes
 themes/default-xhdpi/shade-toggled-active.svg      |  211 ++++++++++
 themes/default-xhdpi/shade-toggled-active.xpm      |   62 +++
 themes/default-xhdpi/shade-toggled-inactive.png    |  Bin 0 -> 638 bytes
 themes/default-xhdpi/shade-toggled-inactive.svg    |  178 +++++++++
 themes/default-xhdpi/shade-toggled-inactive.xpm    |   62 +++
 themes/default-xhdpi/shade-toggled-prelight.png    |  Bin 0 -> 1672 bytes
 themes/default-xhdpi/shade-toggled-prelight.svg    |  229 +++++++++++
 themes/default-xhdpi/shade-toggled-prelight.xpm    |   62 +++
 themes/default-xhdpi/shade-toggled-pressed.png     |  Bin 0 -> 1700 bytes
 themes/default-xhdpi/shade-toggled-pressed.svg     |  229 +++++++++++
 themes/default-xhdpi/shade-toggled-pressed.xpm     |   62 +++
 themes/default-xhdpi/stick-active.png              |  Bin 0 -> 1430 bytes
 themes/default-xhdpi/stick-active.svg              |  211 ++++++++++
 themes/default-xhdpi/stick-active.xpm              |   62 +++
 themes/default-xhdpi/stick-inactive.png            |  Bin 0 -> 807 bytes
 themes/default-xhdpi/stick-inactive.svg            |  178 +++++++++
 themes/default-xhdpi/stick-inactive.xpm            |   62 +++
 themes/default-xhdpi/stick-prelight.png            |  Bin 0 -> 1907 bytes
 themes/default-xhdpi/stick-prelight.svg            |  229 +++++++++++
 themes/default-xhdpi/stick-prelight.xpm            |   62 +++
 themes/default-xhdpi/stick-pressed.png             |  Bin 0 -> 1910 bytes
 themes/default-xhdpi/stick-pressed.svg             |  229 +++++++++++
 themes/default-xhdpi/stick-pressed.xpm             |   62 +++
 themes/default-xhdpi/stick-toggled-active.png      |  Bin 0 -> 1423 bytes
 themes/default-xhdpi/stick-toggled-active.svg      |  220 +++++++++++
 themes/default-xhdpi/stick-toggled-active.xpm      |   62 +++
 themes/default-xhdpi/stick-toggled-inactive.png    |  Bin 0 -> 884 bytes
 themes/default-xhdpi/stick-toggled-inactive.svg    |  187 +++++++++
 themes/default-xhdpi/stick-toggled-inactive.xpm    |   62 +++
 themes/default-xhdpi/stick-toggled-prelight.png    |  Bin 0 -> 1915 bytes
 themes/default-xhdpi/stick-toggled-prelight.svg    |  238 ++++++++++++
 themes/default-xhdpi/stick-toggled-prelight.xpm    |   62 +++
 themes/default-xhdpi/stick-toggled-pressed.png     |  Bin 0 -> 1919 bytes
 themes/default-xhdpi/stick-toggled-pressed.svg     |  238 ++++++++++++
 themes/default-xhdpi/stick-toggled-pressed.xpm     |   62 +++
 themes/default-xhdpi/themerc                       |   14 +
 themes/default-xhdpi/title-1-active.png            |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-1-active.svg            |  164 ++++++++
 themes/default-xhdpi/title-1-active.xpm            |   63 +++
 themes/default-xhdpi/title-1-inactive.png          |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-1-inactive.svg          |  164 ++++++++
 themes/default-xhdpi/title-1-inactive.xpm          |   63 +++
 themes/default-xhdpi/title-2-active.png            |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-2-active.svg            |  164 ++++++++
 themes/default-xhdpi/title-2-active.xpm            |   63 +++
 themes/default-xhdpi/title-2-inactive.png          |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-2-inactive.svg          |  164 ++++++++
 themes/default-xhdpi/title-2-inactive.xpm          |   63 +++
 themes/default-xhdpi/title-3-active.png            |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-3-active.svg            |  164 ++++++++
 themes/default-xhdpi/title-3-active.xpm            |   63 +++
 themes/default-xhdpi/title-3-inactive.png          |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-3-inactive.svg          |  164 ++++++++
 themes/default-xhdpi/title-3-inactive.xpm          |   63 +++
 themes/default-xhdpi/title-4-active.png            |  Bin 0 -> 540 bytes
 themes/default-xhdpi/title-4-active.svg            |  193 ++++++++++
 themes/default-xhdpi/title-4-active.xpm            |   63 +++
 themes/default-xhdpi/title-4-inactive.png          |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-4-inactive.svg          |  164 ++++++++
 themes/default-xhdpi/title-4-inactive.xpm          |   63 +++
 themes/default-xhdpi/title-5-active.png            |  Bin 0 -> 234 bytes
 themes/default-xhdpi/title-5-active.svg            |  193 ++++++++++
 themes/default-xhdpi/title-5-active.xpm            |   63 +++
 themes/default-xhdpi/title-5-inactive.png          |  Bin 0 -> 145 bytes
 themes/default-xhdpi/title-5-inactive.svg          |  164 ++++++++
 themes/default-xhdpi/title-5-inactive.xpm          |   63 +++
 themes/default-xhdpi/top-left-active.png           |  Bin 0 -> 402 bytes
 themes/default-xhdpi/top-left-active.svg           |  161 ++++++++
 themes/default-xhdpi/top-left-active.xpm           |   63 +++
 themes/default-xhdpi/top-left-inactive.png         |  Bin 0 -> 402 bytes
 themes/default-xhdpi/top-left-inactive.svg         |  161 ++++++++
 themes/default-xhdpi/top-left-inactive.xpm         |   63 +++
 themes/default-xhdpi/top-right-active.png          |  Bin 0 -> 473 bytes
 themes/default-xhdpi/top-right-active.svg          |  193 ++++++++++
 themes/default-xhdpi/top-right-active.xpm          |   63 +++
 themes/default-xhdpi/top-right-inactive.png        |  Bin 0 -> 463 bytes
 themes/default-xhdpi/top-right-inactive.svg        |  161 ++++++++
 themes/default-xhdpi/top-right-inactive.xpm        |   63 +++
 themes/default/Makefile.am                         |    2 +-
 themes/default/README                              |    5 +-
 themes/default/bottom-active.png                   |  Bin 96 -> 95 bytes
 themes/default/bottom-active.svg                   |  123 +++---
 themes/default/bottom-active.xpm                   |   13 +-
 themes/default/bottom-inactive.png                 |  Bin 96 -> 95 bytes
 themes/default/bottom-inactive.svg                 |  123 +++---
 themes/default/bottom-inactive.xpm                 |   13 +-
 themes/default/bottom-left-active.png              |  Bin 114 -> 119 bytes
 themes/default/bottom-left-active.svg              |  119 ++++--
 themes/default/bottom-left-active.xpm              |   36 +-
 themes/default/bottom-left-inactive.png            |  Bin 114 -> 119 bytes
 themes/default/bottom-left-inactive.svg            |  119 ++++--
 themes/default/bottom-left-inactive.xpm            |   36 +-
 themes/default/bottom-right-active.png             |  Bin 122 -> 119 bytes
 themes/default/bottom-right-active.svg             |  119 ++++--
 themes/default/bottom-right-active.xpm             |   36 +-
 themes/default/bottom-right-inactive.png           |  Bin 122 -> 119 bytes
 themes/default/bottom-right-inactive.svg           |  119 ++++--
 themes/default/bottom-right-inactive.xpm           |   36 +-
 themes/default/close-active.png                    |  Bin 382 -> 723 bytes
 themes/default/close-active.svg                    |  378 +++++++++---------
 themes/default/close-active.xpm                    |   57 +--
 themes/default/close-inactive.png                  |  Bin 413 -> 525 bytes
 themes/default/close-inactive.svg                  |  329 ++++++++--------
 themes/default/close-inactive.xpm                  |   57 +--
 themes/default/close-prelight.png                  |  Bin 696 -> 1051 bytes
 themes/default/close-prelight.svg                  |  404 ++++++++++----------
 themes/default/close-prelight.xpm                  |   57 +--
 themes/default/close-pressed.png                   |  Bin 694 -> 1073 bytes
 themes/default/close-pressed.svg                   |  404 ++++++++++----------
 themes/default/close-pressed.xpm                   |   59 +--
 themes/default/hide-active.png                     |  Bin 144 -> 258 bytes
 themes/default/hide-active.svg                     |  374 +++++++++---------
 themes/default/hide-active.xpm                     |   57 +--
 themes/default/hide-inactive.png                   |  Bin 119 -> 162 bytes
 themes/default/hide-inactive.svg                   |  331 ++++++++--------
 themes/default/hide-inactive.xpm                   |   57 +--
 themes/default/hide-prelight.png                   |  Bin 294 -> 536 bytes
 themes/default/hide-prelight.svg                   |  400 +++++++++----------
 themes/default/hide-prelight.xpm                   |   57 +--
 themes/default/hide-pressed.png                    |  Bin 393 -> 523 bytes
 themes/default/hide-pressed.svg                    |  400 +++++++++----------
 themes/default/hide-pressed.xpm                    |   59 +--
 themes/default/left-active.png                     |  Bin 95 -> 98 bytes
 themes/default/left-active.svg                     |  119 ++++--
 themes/default/left-active.xpm                     |   56 +--
 themes/default/left-inactive.png                   |  Bin 95 -> 98 bytes
 themes/default/left-inactive.svg                   |  119 ++++--
 themes/default/left-inactive.xpm                   |   56 +--
 themes/default/maximize-active.png                 |  Bin 175 -> 353 bytes
 themes/default/maximize-active.svg                 |  360 ++++++++---------
 themes/default/maximize-active.xpm                 |   57 +--
 themes/default/maximize-inactive.png               |  Bin 134 -> 222 bytes
 themes/default/maximize-inactive.svg               |  325 ++++++++--------
 themes/default/maximize-inactive.xpm               |   57 +--
 themes/default/maximize-prelight.png               |  Bin 316 -> 623 bytes
 themes/default/maximize-prelight.svg               |  386 ++++++++++---------
 themes/default/maximize-prelight.xpm               |   57 +--
 themes/default/maximize-pressed.png                |  Bin 425 -> 610 bytes
 themes/default/maximize-pressed.svg                |  386 ++++++++++---------
 themes/default/maximize-pressed.xpm                |   59 +--
 themes/default/maximize-toggled-active.png         |  Bin 196 -> 432 bytes
 themes/default/maximize-toggled-active.svg         |  366 +++++++++---------
 themes/default/maximize-toggled-active.xpm         |   57 +--
 themes/default/maximize-toggled-inactive.png       |  Bin 158 -> 277 bytes
 themes/default/maximize-toggled-inactive.svg       |  331 ++++++++--------
 themes/default/maximize-toggled-inactive.xpm       |   57 +--
 themes/default/maximize-toggled-prelight.png       |  Bin 334 -> 678 bytes
 themes/default/maximize-toggled-prelight.svg       |  392 +++++++++----------
 themes/default/maximize-toggled-prelight.xpm       |   57 +--
 themes/default/maximize-toggled-pressed.png        |  Bin 429 -> 674 bytes
 themes/default/maximize-toggled-pressed.svg        |  392 +++++++++----------
 themes/default/maximize-toggled-pressed.xpm        |   59 +--
 themes/default/menu-active.png                     |  Bin 109 -> 139 bytes
 themes/default/menu-active.svg                     |  303 +++++++--------
 themes/default/menu-active.xpm                     |   58 +--
 themes/default/menu-inactive.png                   |  Bin 101 -> 139 bytes
 themes/default/menu-inactive.svg                   |  303 +++++++--------
 themes/default/menu-inactive.xpm                   |   58 +--
 themes/default/menu-prelight.png                   |  Bin 109 -> 139 bytes
 themes/default/menu-prelight.svg                   |  303 +++++++--------
 themes/default/menu-prelight.xpm                   |   58 +--
 themes/default/menu-pressed.png                    |  Bin 109 -> 139 bytes
 themes/default/menu-pressed.svg                    |  303 +++++++--------
 themes/default/menu-pressed.xpm                    |   60 +--
 themes/default/right-active.png                    |  Bin 95 -> 95 bytes
 themes/default/right-active.svg                    |  119 ++++--
 themes/default/right-active.xpm                    |   56 +--
 themes/default/right-inactive.png                  |  Bin 95 -> 95 bytes
 themes/default/right-inactive.svg                  |  119 ++++--
 themes/default/right-inactive.xpm                  |   56 +--
 themes/default/shade-active.png                    |  Bin 305 -> 518 bytes
 themes/default/shade-active.svg                    |  360 ++++++++---------
 themes/default/shade-active.xpm                    |   57 +--
 themes/default/shade-inactive.png                  |  Bin 226 -> 347 bytes
 themes/default/shade-inactive.svg                  |  325 ++++++++--------
 themes/default/shade-inactive.xpm                  |   57 +--
 themes/default/shade-prelight.png                  |  Bin 533 -> 789 bytes
 themes/default/shade-prelight.svg                  |  386 ++++++++++---------
 themes/default/shade-prelight.xpm                  |   57 +--
 themes/default/shade-pressed.png                   |  Bin 586 -> 796 bytes
 themes/default/shade-pressed.svg                   |  386 ++++++++++---------
 themes/default/shade-pressed.xpm                   |   59 +--
 themes/default/shade-toggled-active.png            |  Bin 268 -> 514 bytes
 themes/default/shade-toggled-active.svg            |  360 ++++++++---------
 themes/default/shade-toggled-active.xpm            |   57 +--
 themes/default/shade-toggled-inactive.png          |  Bin 239 -> 341 bytes
 themes/default/shade-toggled-inactive.svg          |  325 ++++++++--------
 themes/default/shade-toggled-inactive.xpm          |   57 +--
 themes/default/shade-toggled-prelight.png          |  Bin 567 -> 789 bytes
 themes/default/shade-toggled-prelight.svg          |  386 ++++++++++---------
 themes/default/shade-toggled-prelight.xpm          |   57 +--
 themes/default/shade-toggled-pressed.png           |  Bin 571 -> 772 bytes
 themes/default/shade-toggled-pressed.svg           |  386 ++++++++++---------
 themes/default/shade-toggled-pressed.xpm           |   59 +--
 themes/default/stick-active.png                    |  Bin 351 -> 586 bytes
 themes/default/stick-active.svg                    |  360 ++++++++---------
 themes/default/stick-active.xpm                    |   57 +--
 themes/default/stick-inactive.png                  |  Bin 308 -> 405 bytes
 themes/default/stick-inactive.svg                  |  325 ++++++++--------
 themes/default/stick-inactive.xpm                  |   57 +--
 themes/default/stick-prelight.png                  |  Bin 606 -> 860 bytes
 themes/default/stick-prelight.svg                  |  386 ++++++++++---------
 themes/default/stick-prelight.xpm                  |   57 +--
 themes/default/stick-pressed.png                   |  Bin 662 -> 851 bytes
 themes/default/stick-pressed.svg                   |  386 ++++++++++---------
 themes/default/stick-pressed.xpm                   |   59 +--
 themes/default/stick-toggled-active.png            |  Bin 358 -> 592 bytes
 themes/default/stick-toggled-active.svg            |  372 +++++++++---------
 themes/default/stick-toggled-active.xpm            |   57 +--
 themes/default/stick-toggled-inactive.png          |  Bin 305 -> 406 bytes
 themes/default/stick-toggled-inactive.svg          |  346 ++++++++---------
 themes/default/stick-toggled-inactive.xpm          |   57 +--
 themes/default/stick-toggled-prelight.png          |  Bin 598 -> 870 bytes
 themes/default/stick-toggled-prelight.svg          |  398 +++++++++----------
 themes/default/stick-toggled-prelight.xpm          |   57 +--
 themes/default/stick-toggled-pressed.png           |  Bin 670 -> 859 bytes
 themes/default/stick-toggled-pressed.svg           |  398 +++++++++----------
 themes/default/stick-toggled-pressed.xpm           |   59 +--
 themes/default/themerc                             |   23 +-
 themes/default/title-1-active.png                  |  Bin 104 -> 122 bytes
 themes/default/title-1-active.svg                  |  301 +++++++--------
 themes/default/title-1-active.xpm                  |   57 +--
 themes/default/title-1-inactive.png                |  Bin 95 -> 122 bytes
 themes/default/title-1-inactive.svg                |  301 +++++++--------
 themes/default/title-1-inactive.xpm                |   57 +--
 themes/default/title-2-active.png                  |  Bin 104 -> 122 bytes
 themes/default/title-2-active.svg                  |  301 +++++++--------
 themes/default/title-2-active.xpm                  |   57 +--
 themes/default/title-2-inactive.png                |  Bin 95 -> 122 bytes
 themes/default/title-2-inactive.svg                |  301 +++++++--------
 themes/default/title-2-inactive.xpm                |   57 +--
 themes/default/title-3-active.png                  |  Bin 104 -> 122 bytes
 themes/default/title-3-active.svg                  |  301 +++++++--------
 themes/default/title-3-active.xpm                  |   57 +--
 themes/default/title-3-inactive.png                |  Bin 95 -> 122 bytes
 themes/default/title-3-inactive.svg                |  301 +++++++--------
 themes/default/title-3-inactive.xpm                |   57 +--
 themes/default/title-4-active.png                  |  Bin 104 -> 299 bytes
 themes/default/title-4-active.svg                  |  330 ++++++++--------
 themes/default/title-4-active.xpm                  |   57 +--
 themes/default/title-4-inactive.png                |  Bin 95 -> 122 bytes
 themes/default/title-4-inactive.svg                |  301 +++++++--------
 themes/default/title-4-inactive.xpm                |   57 +--
 themes/default/title-5-active.png                  |  Bin 104 -> 185 bytes
 themes/default/title-5-active.svg                  |  330 ++++++++--------
 themes/default/title-5-active.xpm                  |   57 +--
 themes/default/title-5-inactive.png                |  Bin 95 -> 122 bytes
 themes/default/title-5-inactive.svg                |  301 +++++++--------
 themes/default/title-5-inactive.xpm                |   57 +--
 themes/default/top-left-active.png                 |  Bin 190 -> 246 bytes
 themes/default/top-left-active.svg                 |  292 +++++++-------
 themes/default/top-left-active.xpm                 |   57 +--
 themes/default/top-left-inactive.png               |  Bin 180 -> 246 bytes
 themes/default/top-left-inactive.svg               |  292 +++++++-------
 themes/default/top-left-inactive.xpm               |   57 +--
 themes/default/top-right-active.png                |  Bin 185 -> 311 bytes
 themes/default/top-right-active.svg                |  324 ++++++++--------
 themes/default/top-right-active.xpm                |   57 +--
 themes/default/top-right-inactive.png              |  Bin 183 -> 279 bytes
 themes/default/top-right-inactive.svg              |  292 +++++++-------
 themes/default/top-right-inactive.xpm              |   57 +--
 themes/kokodi/Makefile.am                          |    2 +-
 553 files changed, 39377 insertions(+), 10798 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 716fdb9..aaf122a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -246,6 +246,8 @@ src/Makefile
 themes/Makefile
 themes/daloa/Makefile
 themes/default/Makefile
+themes/default-hdpi/Makefile
+themes/default-xhdpi/Makefile
 themes/kokodi/Makefile
 themes/moheli/Makefile
 ])
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 739b75a..a93344c 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -4,6 +4,8 @@
 SUBDIRS =								\
 	daloa								\
 	default								\
+	default-hdpi							\
+	default-xhdpi							\
 	kokodi								\
 	moheli
 
diff --git a/themes/daloa/Makefile.am b/themes/daloa/Makefile.am
index 884b8c7..a9494e7 100644
--- a/themes/daloa/Makefile.am
+++ b/themes/daloa/Makefile.am
@@ -207,5 +207,5 @@ vacuum-defs:
 update-png:
 	for svg_file in $(SVG_FILES); do \
 		image=$${svg_file%.svg}; \
-		rsvg -f png $$svg_file $$image.png; \
+		rsvg-convert -f png $$svg_file > $$image.png; \
 	done
diff --git a/themes/kokodi/Makefile.am b/themes/default-hdpi/Makefile.am
similarity index 98%
copy from themes/kokodi/Makefile.am
copy to themes/default-hdpi/Makefile.am
index 808cbd2..95e62d9 100644
--- a/themes/kokodi/Makefile.am
+++ b/themes/default-hdpi/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Kokodi/xfwm4
+themedir = $(datadir)/themes/Default-hdpi/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\
@@ -207,5 +207,5 @@ vacuum-defs:
 update-png:
 	for svg_file in $(SVG_FILES); do \
 		image=$${svg_file%.svg}; \
-		rsvg -f png $$svg_file $$image.png; \
+		rsvg-convert -f png $$svg_file > $$image.png; \
 	done
diff --git a/themes/default-hdpi/README b/themes/default-hdpi/README
new file mode 100644
index 0000000..80b8f6e
--- /dev/null
+++ b/themes/default-hdpi/README
@@ -0,0 +1,4 @@
+SVG based theme for xfwm4.
+Created Sept. 2006 by Olivier Fourdan <fourdan at xfce.org>
+Modified Oct. 2014 by Olivier Fourdan <fourdan at xfce.org>
+Theme released under GNU GPL license.
diff --git a/themes/default-hdpi/bottom-active.png b/themes/default-hdpi/bottom-active.png
new file mode 100644
index 0000000..66e9751
Binary files /dev/null and b/themes/default-hdpi/bottom-active.png differ
diff --git a/themes/default-hdpi/bottom-active.svg b/themes/default-hdpi/bottom-active.svg
new file mode 100644
index 0000000..54d7f40
--- /dev/null
+++ b/themes/default-hdpi/bottom-active.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="6"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:guide-points="true"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 0,3.5 L 24,3.5"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-active.xpm b/themes/default-hdpi/bottom-active.xpm
new file mode 100644
index 0000000..bcfac5e
--- /dev/null
+++ b/themes/default-hdpi/bottom-active.xpm
@@ -0,0 +1,12 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"24 6 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"################################",
+"################################",
+"################################",
+"################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-hdpi/bottom-inactive.png b/themes/default-hdpi/bottom-inactive.png
new file mode 100644
index 0000000..66e9751
Binary files /dev/null and b/themes/default-hdpi/bottom-inactive.png differ
diff --git a/themes/default-hdpi/bottom-inactive.svg b/themes/default-hdpi/bottom-inactive.svg
new file mode 100644
index 0000000..b5ec0df
--- /dev/null
+++ b/themes/default-hdpi/bottom-inactive.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="6"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:guide-points="true"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 0,3.5 L 24,3.5"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-inactive.xpm b/themes/default-hdpi/bottom-inactive.xpm
new file mode 100644
index 0000000..bae08b6
--- /dev/null
+++ b/themes/default-hdpi/bottom-inactive.xpm
@@ -0,0 +1,12 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"24 6 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"################################",
+"################################",
+"################################",
+"################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-hdpi/bottom-left-active.png b/themes/default-hdpi/bottom-left-active.png
new file mode 100644
index 0000000..660406b
Binary files /dev/null and b/themes/default-hdpi/bottom-left-active.png differ
diff --git a/themes/default-hdpi/bottom-left-active.svg b/themes/default-hdpi/bottom-left-active.svg
new file mode 100644
index 0000000..b1a1f5b
--- /dev/null
+++ b/themes/default-hdpi/bottom-left-active.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-left-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:black;fill-opacity:0.50"
+           d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+           id="rect1870" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-left-active.xpm b/themes/default-hdpi/bottom-left-active.xpm
new file mode 100644
index 0000000..23b47cd
--- /dev/null
+++ b/themes/default-hdpi/bottom-left-active.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"24 24 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@######################",
+"@@######################",
+"@@######################",
+"@@######################",
+" @@@@@@@@@@@@@@@@@@@@@@@",
+"  @@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-hdpi/bottom-left-inactive.png b/themes/default-hdpi/bottom-left-inactive.png
new file mode 100644
index 0000000..660406b
Binary files /dev/null and b/themes/default-hdpi/bottom-left-inactive.png differ
diff --git a/themes/default-hdpi/bottom-left-inactive.svg b/themes/default-hdpi/bottom-left-inactive.svg
new file mode 100644
index 0000000..b13a0e5
--- /dev/null
+++ b/themes/default-hdpi/bottom-left-inactive.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-left-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:black;fill-opacity:0.50"
+           d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+           id="rect1870" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-left-inactive.xpm b/themes/default-hdpi/bottom-left-inactive.xpm
new file mode 100644
index 0000000..9ecee6e
--- /dev/null
+++ b/themes/default-hdpi/bottom-left-inactive.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"24 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@####                  ",
+"@@######################",
+"@@######################",
+"@@######################",
+"@@######################",
+" @@@@@@@@@@@@@@@@@@@@@@@",
+"  @@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-hdpi/bottom-right-active.png b/themes/default-hdpi/bottom-right-active.png
new file mode 100644
index 0000000..63e1f73
Binary files /dev/null and b/themes/default-hdpi/bottom-right-active.png differ
diff --git a/themes/default-hdpi/bottom-right-active.svg b/themes/default-hdpi/bottom-right-active.svg
new file mode 100644
index 0000000..3547967
--- /dev/null
+++ b/themes/default-hdpi/bottom-right-active.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:black;fill-opacity:0.50"
+           d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+           id="rect1870" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-right-active.xpm b/themes/default-hdpi/bottom-right-active.xpm
new file mode 100644
index 0000000..b9f6c16
--- /dev/null
+++ b/themes/default-hdpi/bottom-right-active.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"24 24 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"######################@@",
+"######################@@",
+"######################@@",
+"######################@@",
+"@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@  "};
diff --git a/themes/default-hdpi/bottom-right-inactive.png b/themes/default-hdpi/bottom-right-inactive.png
new file mode 100644
index 0000000..63e1f73
Binary files /dev/null and b/themes/default-hdpi/bottom-right-inactive.png differ
diff --git a/themes/default-hdpi/bottom-right-inactive.svg b/themes/default-hdpi/bottom-right-inactive.svg
new file mode 100644
index 0000000..d87e3a0
--- /dev/null
+++ b/themes/default-hdpi/bottom-right-inactive.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:grid-points="true" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:black;fill-opacity:0.50"
+           d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+           id="rect1870" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/bottom-right-inactive.xpm b/themes/default-hdpi/bottom-right-inactive.xpm
new file mode 100644
index 0000000..c6471df
--- /dev/null
+++ b/themes/default-hdpi/bottom-right-inactive.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"24 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"                  ####@@",
+"######################@@",
+"######################@@",
+"######################@@",
+"######################@@",
+"@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@  "};
diff --git a/themes/default-hdpi/close-active.png b/themes/default-hdpi/close-active.png
new file mode 100644
index 0000000..3abc2e4
Binary files /dev/null and b/themes/default-hdpi/close-active.png differ
diff --git a/themes/default-hdpi/close-active.svg b/themes/default-hdpi/close-active.svg
new file mode 100644
index 0000000..d184331
--- /dev/null
+++ b/themes/default-hdpi/close-active.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/close-active.xpm b/themes/default-hdpi/close-active.xpm
new file mode 100644
index 0000000..92d262b
--- /dev/null
+++ b/themes/default-hdpi/close-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/close-inactive.png b/themes/default-hdpi/close-inactive.png
new file mode 100644
index 0000000..58dfc86
Binary files /dev/null and b/themes/default-hdpi/close-inactive.png differ
diff --git a/themes/default-hdpi/close-inactive.svg b/themes/default-hdpi/close-inactive.svg
new file mode 100644
index 0000000..4298135
--- /dev/null
+++ b/themes/default-hdpi/close-inactive.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(3,9)">
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/close-inactive.xpm b/themes/default-hdpi/close-inactive.xpm
new file mode 100644
index 0000000..912db27
--- /dev/null
+++ b/themes/default-hdpi/close-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/close-prelight.png b/themes/default-hdpi/close-prelight.png
new file mode 100644
index 0000000..c7fd79c
Binary files /dev/null and b/themes/default-hdpi/close-prelight.png differ
diff --git a/themes/default-hdpi/close-prelight.svg b/themes/default-hdpi/close-prelight.svg
new file mode 100644
index 0000000..b6150f5
--- /dev/null
+++ b/themes/default-hdpi/close-prelight.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata41" />
+  <defs
+     id="defs39" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/close-prelight.xpm b/themes/default-hdpi/close-prelight.xpm
new file mode 100644
index 0000000..92d262b
--- /dev/null
+++ b/themes/default-hdpi/close-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/close-pressed.png b/themes/default-hdpi/close-pressed.png
new file mode 100644
index 0000000..da872d4
Binary files /dev/null and b/themes/default-hdpi/close-pressed.png differ
diff --git a/themes/default-hdpi/close-pressed.svg b/themes/default-hdpi/close-pressed.svg
new file mode 100644
index 0000000..ca8dbf8
--- /dev/null
+++ b/themes/default-hdpi/close-pressed.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata41" />
+  <defs
+     id="defs39" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,10)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/close-pressed.xpm b/themes/default-hdpi/close-pressed.xpm
new file mode 100644
index 0000000..f5cd2bb
--- /dev/null
+++ b/themes/default-hdpi/close-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/hide-active.png b/themes/default-hdpi/hide-active.png
new file mode 100644
index 0000000..9a1c7c3
Binary files /dev/null and b/themes/default-hdpi/hide-active.png differ
diff --git a/themes/default-hdpi/hide-active.svg b/themes/default-hdpi/hide-active.svg
new file mode 100644
index 0000000..c1f1fec
--- /dev/null
+++ b/themes/default-hdpi/hide-active.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata35" />
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/hide-active.xpm b/themes/default-hdpi/hide-active.xpm
new file mode 100644
index 0000000..650bb4d
--- /dev/null
+++ b/themes/default-hdpi/hide-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/hide-inactive.png b/themes/default-hdpi/hide-inactive.png
new file mode 100644
index 0000000..a30205e
Binary files /dev/null and b/themes/default-hdpi/hide-inactive.png differ
diff --git a/themes/default-hdpi/hide-inactive.svg b/themes/default-hdpi/hide-inactive.svg
new file mode 100644
index 0000000..11d5098
--- /dev/null
+++ b/themes/default-hdpi/hide-inactive.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28" />
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview24" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <rect
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/hide-inactive.xpm b/themes/default-hdpi/hide-inactive.xpm
new file mode 100644
index 0000000..f5145ec
--- /dev/null
+++ b/themes/default-hdpi/hide-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/hide-prelight.png b/themes/default-hdpi/hide-prelight.png
new file mode 100644
index 0000000..f6118b8
Binary files /dev/null and b/themes/default-hdpi/hide-prelight.png differ
diff --git a/themes/default-hdpi/hide-prelight.svg b/themes/default-hdpi/hide-prelight.svg
new file mode 100644
index 0000000..07b3cae
--- /dev/null
+++ b/themes/default-hdpi/hide-prelight.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/hide-prelight.xpm b/themes/default-hdpi/hide-prelight.xpm
new file mode 100644
index 0000000..650bb4d
--- /dev/null
+++ b/themes/default-hdpi/hide-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/hide-pressed.png b/themes/default-hdpi/hide-pressed.png
new file mode 100644
index 0000000..41cc10a
Binary files /dev/null and b/themes/default-hdpi/hide-pressed.png differ
diff --git a/themes/default-hdpi/hide-pressed.svg b/themes/default-hdpi/hide-pressed.svg
new file mode 100644
index 0000000..aec8417
--- /dev/null
+++ b/themes/default-hdpi/hide-pressed.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/hide-pressed.xpm b/themes/default-hdpi/hide-pressed.xpm
new file mode 100644
index 0000000..7784eee
--- /dev/null
+++ b/themes/default-hdpi/hide-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/left-active.png b/themes/default-hdpi/left-active.png
new file mode 100644
index 0000000..15434c0
Binary files /dev/null and b/themes/default-hdpi/left-active.png differ
diff --git a/themes/default-hdpi/left-active.svg b/themes/default-hdpi/left-active.svg
new file mode 100644
index 0000000..92b0c25
--- /dev/null
+++ b/themes/default-hdpi/left-active.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="left-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 0.5,0 L 0.5,24"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/left-active.xpm b/themes/default-hdpi/left-active.xpm
new file mode 100644
index 0000000..0d44bb9
--- /dev/null
+++ b/themes/default-hdpi/left-active.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"6 24 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####"};
diff --git a/themes/default-hdpi/left-inactive.png b/themes/default-hdpi/left-inactive.png
new file mode 100644
index 0000000..15434c0
Binary files /dev/null and b/themes/default-hdpi/left-inactive.png differ
diff --git a/themes/default-hdpi/left-inactive.svg b/themes/default-hdpi/left-inactive.svg
new file mode 100644
index 0000000..6c641ff
--- /dev/null
+++ b/themes/default-hdpi/left-inactive.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="left-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 0.5,0 L 0.5,24"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/left-inactive.xpm b/themes/default-hdpi/left-inactive.xpm
new file mode 100644
index 0000000..766d409
--- /dev/null
+++ b/themes/default-hdpi/left-inactive.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"6 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####",
+"@@####"};
diff --git a/themes/default-hdpi/maximize-active.png b/themes/default-hdpi/maximize-active.png
new file mode 100644
index 0000000..c98294a
Binary files /dev/null and b/themes/default-hdpi/maximize-active.png differ
diff --git a/themes/default-hdpi/maximize-active.svg b/themes/default-hdpi/maximize-active.svg
new file mode 100644
index 0000000..1b0ef10
--- /dev/null
+++ b/themes/default-hdpi/maximize-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata35" />
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-active.xpm b/themes/default-hdpi/maximize-active.xpm
new file mode 100644
index 0000000..a6ee3a3
--- /dev/null
+++ b/themes/default-hdpi/maximize-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-inactive.png b/themes/default-hdpi/maximize-inactive.png
new file mode 100644
index 0000000..8b8012c
Binary files /dev/null and b/themes/default-hdpi/maximize-inactive.png differ
diff --git a/themes/default-hdpi/maximize-inactive.svg b/themes/default-hdpi/maximize-inactive.svg
new file mode 100644
index 0000000..4e6bab4
--- /dev/null
+++ b/themes/default-hdpi/maximize-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28" />
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview24" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(3,9)">
+        <path
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           id="rect2275" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-inactive.xpm b/themes/default-hdpi/maximize-inactive.xpm
new file mode 100644
index 0000000..020d069
--- /dev/null
+++ b/themes/default-hdpi/maximize-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-prelight.png b/themes/default-hdpi/maximize-prelight.png
new file mode 100644
index 0000000..e899ebd
Binary files /dev/null and b/themes/default-hdpi/maximize-prelight.png differ
diff --git a/themes/default-hdpi/maximize-prelight.svg b/themes/default-hdpi/maximize-prelight.svg
new file mode 100644
index 0000000..4e93c37
--- /dev/null
+++ b/themes/default-hdpi/maximize-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-prelight.xpm b/themes/default-hdpi/maximize-prelight.xpm
new file mode 100644
index 0000000..a6ee3a3
--- /dev/null
+++ b/themes/default-hdpi/maximize-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-pressed.png b/themes/default-hdpi/maximize-pressed.png
new file mode 100644
index 0000000..433247e
Binary files /dev/null and b/themes/default-hdpi/maximize-pressed.png differ
diff --git a/themes/default-hdpi/maximize-pressed.svg b/themes/default-hdpi/maximize-pressed.svg
new file mode 100644
index 0000000..ec18da4
--- /dev/null
+++ b/themes/default-hdpi/maximize-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,10)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-pressed.xpm b/themes/default-hdpi/maximize-pressed.xpm
new file mode 100644
index 0000000..7a60f67
--- /dev/null
+++ b/themes/default-hdpi/maximize-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-toggled-active.png b/themes/default-hdpi/maximize-toggled-active.png
new file mode 100644
index 0000000..d6fd1f3
Binary files /dev/null and b/themes/default-hdpi/maximize-toggled-active.png differ
diff --git a/themes/default-hdpi/maximize-toggled-active.svg b/themes/default-hdpi/maximize-toggled-active.svg
new file mode 100644
index 0000000..5f9e0f2
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-active.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-toggled-active.xpm b/themes/default-hdpi/maximize-toggled-active.xpm
new file mode 100644
index 0000000..b63731a
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-toggled-inactive.png b/themes/default-hdpi/maximize-toggled-inactive.png
new file mode 100644
index 0000000..9ac44e2
Binary files /dev/null and b/themes/default-hdpi/maximize-toggled-inactive.png differ
diff --git a/themes/default-hdpi/maximize-toggled-inactive.svg b/themes/default-hdpi/maximize-toggled-inactive.svg
new file mode 100644
index 0000000..de7db88
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-inactive.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1639"
+         transform="translate(3,9)">
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-toggled-inactive.xpm b/themes/default-hdpi/maximize-toggled-inactive.xpm
new file mode 100644
index 0000000..676cfd6
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_toggled_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-toggled-prelight.png b/themes/default-hdpi/maximize-toggled-prelight.png
new file mode 100644
index 0000000..1777537
Binary files /dev/null and b/themes/default-hdpi/maximize-toggled-prelight.png differ
diff --git a/themes/default-hdpi/maximize-toggled-prelight.svg b/themes/default-hdpi/maximize-toggled-prelight.svg
new file mode 100644
index 0000000..b25fc05
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-prelight.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-toggled-prelight.xpm b/themes/default-hdpi/maximize-toggled-prelight.xpm
new file mode 100644
index 0000000..b63731a
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/maximize-toggled-pressed.png b/themes/default-hdpi/maximize-toggled-pressed.png
new file mode 100644
index 0000000..34729c5
Binary files /dev/null and b/themes/default-hdpi/maximize-toggled-pressed.png differ
diff --git a/themes/default-hdpi/maximize-toggled-pressed.svg b/themes/default-hdpi/maximize-toggled-pressed.svg
new file mode 100644
index 0000000..6ea8bd4
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-pressed.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,10)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/maximize-toggled-pressed.xpm b/themes/default-hdpi/maximize-toggled-pressed.xpm
new file mode 100644
index 0000000..75b0990
--- /dev/null
+++ b/themes/default-hdpi/maximize-toggled-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/menu-active.png b/themes/default-hdpi/menu-active.png
new file mode 100644
index 0000000..c697cae
Binary files /dev/null and b/themes/default-hdpi/menu-active.png differ
diff --git a/themes/default-hdpi/menu-active.svg b/themes/default-hdpi/menu-active.svg
new file mode 100644
index 0000000..2a3ec7b
--- /dev/null
+++ b/themes/default-hdpi/menu-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/menu-active.xpm b/themes/default-hdpi/menu-active.xpm
new file mode 100644
index 0000000..281a00a
--- /dev/null
+++ b/themes/default-hdpi/menu-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/menu-inactive.png b/themes/default-hdpi/menu-inactive.png
new file mode 100644
index 0000000..c697cae
Binary files /dev/null and b/themes/default-hdpi/menu-inactive.png differ
diff --git a/themes/default-hdpi/menu-inactive.svg b/themes/default-hdpi/menu-inactive.svg
new file mode 100644
index 0000000..12138c4
--- /dev/null
+++ b/themes/default-hdpi/menu-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/menu-inactive.xpm b/themes/default-hdpi/menu-inactive.xpm
new file mode 100644
index 0000000..79ca4b6
--- /dev/null
+++ b/themes/default-hdpi/menu-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/menu-prelight.png b/themes/default-hdpi/menu-prelight.png
new file mode 100644
index 0000000..c697cae
Binary files /dev/null and b/themes/default-hdpi/menu-prelight.png differ
diff --git a/themes/default-hdpi/menu-prelight.svg b/themes/default-hdpi/menu-prelight.svg
new file mode 100644
index 0000000..5c35767
--- /dev/null
+++ b/themes/default-hdpi/menu-prelight.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/menu-prelight.xpm b/themes/default-hdpi/menu-prelight.xpm
new file mode 100644
index 0000000..281a00a
--- /dev/null
+++ b/themes/default-hdpi/menu-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/menu-pressed.png b/themes/default-hdpi/menu-pressed.png
new file mode 100644
index 0000000..c697cae
Binary files /dev/null and b/themes/default-hdpi/menu-pressed.png differ
diff --git a/themes/default-hdpi/menu-pressed.svg b/themes/default-hdpi/menu-pressed.svg
new file mode 100644
index 0000000..fc71e49
--- /dev/null
+++ b/themes/default-hdpi/menu-pressed.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/menu-pressed.xpm b/themes/default-hdpi/menu-pressed.xpm
new file mode 100644
index 0000000..888a3c1
--- /dev/null
+++ b/themes/default-hdpi/menu-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/right-active.png b/themes/default-hdpi/right-active.png
new file mode 100644
index 0000000..767a524
Binary files /dev/null and b/themes/default-hdpi/right-active.png differ
diff --git a/themes/default-hdpi/right-active.svg b/themes/default-hdpi/right-active.svg
new file mode 100644
index 0000000..a78c53a
--- /dev/null
+++ b/themes/default-hdpi/right-active.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 3.5,0 L 3.5,24"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/right-active.xpm b/themes/default-hdpi/right-active.xpm
new file mode 100644
index 0000000..1b90c11
--- /dev/null
+++ b/themes/default-hdpi/right-active.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"6 24 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@"};
diff --git a/themes/default-hdpi/right-inactive.png b/themes/default-hdpi/right-inactive.png
new file mode 100644
index 0000000..767a524
Binary files /dev/null and b/themes/default-hdpi/right-inactive.png differ
diff --git a/themes/default-hdpi/right-inactive.svg b/themes/default-hdpi/right-inactive.svg
new file mode 100644
index 0000000..59e50b5
--- /dev/null
+++ b/themes/default-hdpi/right-inactive.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata17" />
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview13" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs12" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       bordercolor="#666666"
+       borderopacity="1"
+       objecttolerance="10"
+       gridtolerance="10"
+       guidetolerance="10"
+       inkscape:pageopacity="0"
+       inkscape:pageshadow="2"
+       inkscape:window-width="640"
+       inkscape:window-height="480"
+       id="namedview10" />
+    <g
+       transform="scale(1)"
+       id="g6">
+      <defs
+         id="defs4" />
+      <sodipodi:namedview
+         id="base"
+         pagecolor="white"
+         bordercolor="#666666"
+         borderopacity="1.0"
+         inkscape:pageopacity="0.0"
+         inkscape:pageshadow="2"
+         inkscape:zoom="10"
+         inkscape:cx="0"
+         inkscape:cy="0"
+         inkscape:document-units="px"
+         inkscape:current-layer="layer1"
+         showgrid="true"
+         inkscape:grid-bbox="true"
+         inkscape:window-width="640"
+         inkscape:window-height="400"
+         inkscape:window-x="0"
+         inkscape:window-y="0" />
+      <metadata
+         id="metadata7">
+        <rdf:RDF>
+          <cc:Work
+             rdf:about="">
+            <dc:format>image/svg+xml</dc:format>
+            <dc:type
+               rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            <dc:title>Border</dc:title>
+            <dc:creator>
+              <cc:Agent>
+                <dc:title>Olivier Fourdan</dc:title>
+              </cc:Agent>
+            </dc:creator>
+            <cc:license
+               rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+          </cc:Work>
+          <cc:License
+             rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Reproduction" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/Distribution" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/Notice" />
+            <cc:permits
+               rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/ShareAlike" />
+            <cc:requires
+               rdf:resource="http://web.resource.org/cc/SourceCode" />
+          </cc:License>
+        </rdf:RDF>
+      </metadata>
+      <g
+         inkscape:label="Layer 1"
+         inkscape:groupmode="layer"
+         id="layer1">
+        <path
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+           d="M 3.5,0 L 3.5,24"
+           id="path1340" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/right-inactive.xpm b/themes/default-hdpi/right-inactive.xpm
new file mode 100644
index 0000000..723c203
--- /dev/null
+++ b/themes/default-hdpi/right-inactive.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"6 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@",
+"####@@"};
diff --git a/themes/default-hdpi/shade-active.png b/themes/default-hdpi/shade-active.png
new file mode 100644
index 0000000..fd3681b
Binary files /dev/null and b/themes/default-hdpi/shade-active.png differ
diff --git a/themes/default-hdpi/shade-active.svg b/themes/default-hdpi/shade-active.svg
new file mode 100644
index 0000000..998937a
--- /dev/null
+++ b/themes/default-hdpi/shade-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata35" />
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-active.xpm b/themes/default-hdpi/shade-active.xpm
new file mode 100644
index 0000000..355490a
--- /dev/null
+++ b/themes/default-hdpi/shade-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-inactive.png b/themes/default-hdpi/shade-inactive.png
new file mode 100644
index 0000000..c2f8ffb
Binary files /dev/null and b/themes/default-hdpi/shade-inactive.png differ
diff --git a/themes/default-hdpi/shade-inactive.svg b/themes/default-hdpi/shade-inactive.svg
new file mode 100644
index 0000000..02e604b
--- /dev/null
+++ b/themes/default-hdpi/shade-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28" />
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview24" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-inactive.xpm b/themes/default-hdpi/shade-inactive.xpm
new file mode 100644
index 0000000..37ff26a
--- /dev/null
+++ b/themes/default-hdpi/shade-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-prelight.png b/themes/default-hdpi/shade-prelight.png
new file mode 100644
index 0000000..9d54d26
Binary files /dev/null and b/themes/default-hdpi/shade-prelight.png differ
diff --git a/themes/default-hdpi/shade-prelight.svg b/themes/default-hdpi/shade-prelight.svg
new file mode 100644
index 0000000..f1aba70
--- /dev/null
+++ b/themes/default-hdpi/shade-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-prelight.xpm b/themes/default-hdpi/shade-prelight.xpm
new file mode 100644
index 0000000..355490a
--- /dev/null
+++ b/themes/default-hdpi/shade-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-pressed.png b/themes/default-hdpi/shade-pressed.png
new file mode 100644
index 0000000..81aca08
Binary files /dev/null and b/themes/default-hdpi/shade-pressed.png differ
diff --git a/themes/default-hdpi/shade-pressed.svg b/themes/default-hdpi/shade-pressed.svg
new file mode 100644
index 0000000..9bec32a
--- /dev/null
+++ b/themes/default-hdpi/shade-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-pressed.xpm b/themes/default-hdpi/shade-pressed.xpm
new file mode 100644
index 0000000..0f66763
--- /dev/null
+++ b/themes/default-hdpi/shade-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-toggled-active.png b/themes/default-hdpi/shade-toggled-active.png
new file mode 100644
index 0000000..d5afc7e
Binary files /dev/null and b/themes/default-hdpi/shade-toggled-active.png differ
diff --git a/themes/default-hdpi/shade-toggled-active.svg b/themes/default-hdpi/shade-toggled-active.svg
new file mode 100644
index 0000000..b507d6b
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata35" />
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-toggled-active.xpm b/themes/default-hdpi/shade-toggled-active.xpm
new file mode 100644
index 0000000..751b983
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-toggled-inactive.png b/themes/default-hdpi/shade-toggled-inactive.png
new file mode 100644
index 0000000..a621a06
Binary files /dev/null and b/themes/default-hdpi/shade-toggled-inactive.png differ
diff --git a/themes/default-hdpi/shade-toggled-inactive.svg b/themes/default-hdpi/shade-toggled-inactive.svg
new file mode 100644
index 0000000..1b8e631
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28" />
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview24" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-toggled-inactive.xpm b/themes/default-hdpi/shade-toggled-inactive.xpm
new file mode 100644
index 0000000..eec52d9
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_toggled_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-toggled-prelight.png b/themes/default-hdpi/shade-toggled-prelight.png
new file mode 100644
index 0000000..c6f6bec
Binary files /dev/null and b/themes/default-hdpi/shade-toggled-prelight.png differ
diff --git a/themes/default-hdpi/shade-toggled-prelight.svg b/themes/default-hdpi/shade-toggled-prelight.svg
new file mode 100644
index 0000000..a1ab016
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-toggled-prelight.xpm b/themes/default-hdpi/shade-toggled-prelight.xpm
new file mode 100644
index 0000000..751b983
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/shade-toggled-pressed.png b/themes/default-hdpi/shade-toggled-pressed.png
new file mode 100644
index 0000000..f242156
Binary files /dev/null and b/themes/default-hdpi/shade-toggled-pressed.png differ
diff --git a/themes/default-hdpi/shade-toggled-pressed.svg b/themes/default-hdpi/shade-toggled-pressed.svg
new file mode 100644
index 0000000..43666be
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,10)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/shade-toggled-pressed.xpm b/themes/default-hdpi/shade-toggled-pressed.xpm
new file mode 100644
index 0000000..4543247
--- /dev/null
+++ b/themes/default-hdpi/shade-toggled-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * shade_toggled_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-active.png b/themes/default-hdpi/stick-active.png
new file mode 100644
index 0000000..3b3dc66
Binary files /dev/null and b/themes/default-hdpi/stick-active.png differ
diff --git a/themes/default-hdpi/stick-active.svg b/themes/default-hdpi/stick-active.svg
new file mode 100644
index 0000000..bc1c6e9
--- /dev/null
+++ b/themes/default-hdpi/stick-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata35" />
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-active.xpm b/themes/default-hdpi/stick-active.xpm
new file mode 100644
index 0000000..7608eb9
--- /dev/null
+++ b/themes/default-hdpi/stick-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-inactive.png b/themes/default-hdpi/stick-inactive.png
new file mode 100644
index 0000000..9b62596
Binary files /dev/null and b/themes/default-hdpi/stick-inactive.png differ
diff --git a/themes/default-hdpi/stick-inactive.svg b/themes/default-hdpi/stick-inactive.svg
new file mode 100644
index 0000000..7780f51
--- /dev/null
+++ b/themes/default-hdpi/stick-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata28" />
+  <defs
+     id="defs26" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview24" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-inactive.xpm b/themes/default-hdpi/stick-inactive.xpm
new file mode 100644
index 0000000..55506e6
--- /dev/null
+++ b/themes/default-hdpi/stick-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-prelight.png b/themes/default-hdpi/stick-prelight.png
new file mode 100644
index 0000000..d7670a2
Binary files /dev/null and b/themes/default-hdpi/stick-prelight.png differ
diff --git a/themes/default-hdpi/stick-prelight.svg b/themes/default-hdpi/stick-prelight.svg
new file mode 100644
index 0000000..8227b05
--- /dev/null
+++ b/themes/default-hdpi/stick-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-prelight.xpm b/themes/default-hdpi/stick-prelight.xpm
new file mode 100644
index 0000000..7608eb9
--- /dev/null
+++ b/themes/default-hdpi/stick-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-pressed.png b/themes/default-hdpi/stick-pressed.png
new file mode 100644
index 0000000..144adcf
Binary files /dev/null and b/themes/default-hdpi/stick-pressed.png differ
diff --git a/themes/default-hdpi/stick-pressed.svg b/themes/default-hdpi/stick-pressed.svg
new file mode 100644
index 0000000..51a8ce2
--- /dev/null
+++ b/themes/default-hdpi/stick-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata38" />
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-pressed.xpm b/themes/default-hdpi/stick-pressed.xpm
new file mode 100644
index 0000000..78f5cc7
--- /dev/null
+++ b/themes/default-hdpi/stick-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-toggled-active.png b/themes/default-hdpi/stick-toggled-active.png
new file mode 100644
index 0000000..de8757a
Binary files /dev/null and b/themes/default-hdpi/stick-toggled-active.png differ
diff --git a/themes/default-hdpi/stick-toggled-active.svg b/themes/default-hdpi/stick-toggled-active.svg
new file mode 100644
index 0000000..0a6e7fa
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-active.svg
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-toggled-active.xpm b/themes/default-hdpi/stick-toggled-active.xpm
new file mode 100644
index 0000000..a8582a0
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-toggled-inactive.png b/themes/default-hdpi/stick-toggled-inactive.png
new file mode 100644
index 0000000..96e32d7
Binary files /dev/null and b/themes/default-hdpi/stick-toggled-inactive.png differ
diff --git a/themes/default-hdpi/stick-toggled-inactive.svg b/themes/default-hdpi/stick-toggled-inactive.svg
new file mode 100644
index 0000000..d0d9aee
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-inactive.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2202"
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-toggled-inactive.xpm b/themes/default-hdpi/stick-toggled-inactive.xpm
new file mode 100644
index 0000000..4f83d73
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_toggled_inactive_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-toggled-prelight.png b/themes/default-hdpi/stick-toggled-prelight.png
new file mode 100644
index 0000000..ba36054
Binary files /dev/null and b/themes/default-hdpi/stick-toggled-prelight.png differ
diff --git a/themes/default-hdpi/stick-toggled-prelight.svg b/themes/default-hdpi/stick-toggled-prelight.svg
new file mode 100644
index 0000000..f812dee
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-prelight.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-toggled-prelight.xpm b/themes/default-hdpi/stick-toggled-prelight.xpm
new file mode 100644
index 0000000..a8582a0
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-prelight.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/stick-toggled-pressed.png b/themes/default-hdpi/stick-toggled-pressed.png
new file mode 100644
index 0000000..ad4801a
Binary files /dev/null and b/themes/default-hdpi/stick-toggled-pressed.png differ
diff --git a/themes/default-hdpi/stick-toggled-pressed.svg b/themes/default-hdpi/stick-toggled-pressed.svg
new file mode 100644
index 0000000..d6c5d7f
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-pressed.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/stick-toggled-pressed.xpm b/themes/default-hdpi/stick-toggled-pressed.xpm
new file mode 100644
index 0000000..3c8e57e
--- /dev/null
+++ b/themes/default-hdpi/stick-toggled-pressed.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * stick_toggled_pressed_xpm[] = {
+"33 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+".................................",
+"................................."};
diff --git a/themes/default-hdpi/themerc b/themes/default-hdpi/themerc
new file mode 100644
index 0000000..061359f
--- /dev/null
+++ b/themes/default-hdpi/themerc
@@ -0,0 +1,14 @@
+active_text_color=#0c0c0f
+active_text_shadow_color=#fcfcff
+inactive_text_color=#6c6c70
+inactive_text_shadow_color=#fcfcff
+button_offset=2
+button_spacing=0
+full_width_title=true
+maximized_offset=0
+show_app_icon=true
+title_horizontal_offset=1
+title_shadow_active=under
+title_shadow_inactive=under
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
diff --git a/themes/default-hdpi/title-1-active.png b/themes/default-hdpi/title-1-active.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-1-active.png differ
diff --git a/themes/default-hdpi/title-1-active.svg b/themes/default-hdpi/title-1-active.svg
new file mode 100644
index 0000000..f8a50d2
--- /dev/null
+++ b/themes/default-hdpi/title-1-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-1-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-1-active.xpm b/themes/default-hdpi/title-1-active.xpm
new file mode 100644
index 0000000..bb54dcb
--- /dev/null
+++ b/themes/default-hdpi/title-1-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-1-inactive.png b/themes/default-hdpi/title-1-inactive.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-1-inactive.png differ
diff --git a/themes/default-hdpi/title-1-inactive.svg b/themes/default-hdpi/title-1-inactive.svg
new file mode 100644
index 0000000..ac7f4dc
--- /dev/null
+++ b/themes/default-hdpi/title-1-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-1-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-1-inactive.xpm b/themes/default-hdpi/title-1-inactive.xpm
new file mode 100644
index 0000000..78bc9e2
--- /dev/null
+++ b/themes/default-hdpi/title-1-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-2-active.png b/themes/default-hdpi/title-2-active.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-2-active.png differ
diff --git a/themes/default-hdpi/title-2-active.svg b/themes/default-hdpi/title-2-active.svg
new file mode 100644
index 0000000..ca0f40a
--- /dev/null
+++ b/themes/default-hdpi/title-2-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-2-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-2-active.xpm b/themes/default-hdpi/title-2-active.xpm
new file mode 100644
index 0000000..bb54dcb
--- /dev/null
+++ b/themes/default-hdpi/title-2-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-2-inactive.png b/themes/default-hdpi/title-2-inactive.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-2-inactive.png differ
diff --git a/themes/default-hdpi/title-2-inactive.svg b/themes/default-hdpi/title-2-inactive.svg
new file mode 100644
index 0000000..854b13b
--- /dev/null
+++ b/themes/default-hdpi/title-2-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-2-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-2-inactive.xpm b/themes/default-hdpi/title-2-inactive.xpm
new file mode 100644
index 0000000..78bc9e2
--- /dev/null
+++ b/themes/default-hdpi/title-2-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-3-active.png b/themes/default-hdpi/title-3-active.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-3-active.png differ
diff --git a/themes/default-hdpi/title-3-active.svg b/themes/default-hdpi/title-3-active.svg
new file mode 100644
index 0000000..be5c687
--- /dev/null
+++ b/themes/default-hdpi/title-3-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-3-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer2"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-3-active.xpm b/themes/default-hdpi/title-3-active.xpm
new file mode 100644
index 0000000..bb54dcb
--- /dev/null
+++ b/themes/default-hdpi/title-3-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-3-inactive.png b/themes/default-hdpi/title-3-inactive.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-3-inactive.png differ
diff --git a/themes/default-hdpi/title-3-inactive.svg b/themes/default-hdpi/title-3-inactive.svg
new file mode 100644
index 0000000..02d9cfb
--- /dev/null
+++ b/themes/default-hdpi/title-3-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-3-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-3-inactive.xpm b/themes/default-hdpi/title-3-inactive.xpm
new file mode 100644
index 0000000..78bc9e2
--- /dev/null
+++ b/themes/default-hdpi/title-3-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-4-active.png b/themes/default-hdpi/title-4-active.png
new file mode 100644
index 0000000..b966ef8
Binary files /dev/null and b/themes/default-hdpi/title-4-active.png differ
diff --git a/themes/default-hdpi/title-4-active.svg b/themes/default-hdpi/title-4-active.svg
new file mode 100644
index 0000000..f8a7a9c
--- /dev/null
+++ b/themes/default-hdpi/title-4-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-4-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata31" />
+  <defs
+     id="defs29" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview27" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-4-active.xpm b/themes/default-hdpi/title-4-active.xpm
new file mode 100644
index 0000000..bb54dcb
--- /dev/null
+++ b/themes/default-hdpi/title-4-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-4-inactive.png b/themes/default-hdpi/title-4-inactive.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-4-inactive.png differ
diff --git a/themes/default-hdpi/title-4-inactive.svg b/themes/default-hdpi/title-4-inactive.svg
new file mode 100644
index 0000000..c39ce20
--- /dev/null
+++ b/themes/default-hdpi/title-4-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-4-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-4-inactive.xpm b/themes/default-hdpi/title-4-inactive.xpm
new file mode 100644
index 0000000..78bc9e2
--- /dev/null
+++ b/themes/default-hdpi/title-4-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-5-active.png b/themes/default-hdpi/title-5-active.png
new file mode 100644
index 0000000..7cf3ccf
Binary files /dev/null and b/themes/default-hdpi/title-5-active.png differ
diff --git a/themes/default-hdpi/title-5-active.svg b/themes/default-hdpi/title-5-active.svg
new file mode 100644
index 0000000..4107909
--- /dev/null
+++ b/themes/default-hdpi/title-5-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-5-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata31" />
+  <defs
+     id="defs29" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview27" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 7.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-5-active.xpm b/themes/default-hdpi/title-5-active.xpm
new file mode 100644
index 0000000..bb54dcb
--- /dev/null
+++ b/themes/default-hdpi/title-5-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/title-5-inactive.png b/themes/default-hdpi/title-5-inactive.png
new file mode 100644
index 0000000..bbf6359
Binary files /dev/null and b/themes/default-hdpi/title-5-inactive.png differ
diff --git a/themes/default-hdpi/title-5-inactive.svg b/themes/default-hdpi/title-5-inactive.svg
new file mode 100644
index 0000000..4bd9d10
--- /dev/null
+++ b/themes/default-hdpi/title-5-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-5-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/title-5-inactive.xpm b/themes/default-hdpi/title-5-inactive.xpm
new file mode 100644
index 0000000..78bc9e2
--- /dev/null
+++ b/themes/default-hdpi/title-5-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"6 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-hdpi/top-left-active.png b/themes/default-hdpi/top-left-active.png
new file mode 100644
index 0000000..91b0404
Binary files /dev/null and b/themes/default-hdpi/top-left-active.png differ
diff --git a/themes/default-hdpi/top-left-active.svg b/themes/default-hdpi/top-left-active.svg
new file mode 100644
index 0000000..f094b7d
--- /dev/null
+++ b/themes/default-hdpi/top-left-active.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="top-left-active.svg"
+   version="1.0"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:version="0.32"
+   id="svg2"
+   width="12"
+   height="43"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/top-left-active.xpm b/themes/default-hdpi/top-left-active.xpm
new file mode 100644
index 0000000..b5d91c9
--- /dev/null
+++ b/themes/default-hdpi/top-left-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"12 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"       .....",
+"     .......",
+"   .........",
+"  ..........",
+"  ..........",
+" ...........",
+" ...........",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............"};
diff --git a/themes/default-hdpi/top-left-inactive.png b/themes/default-hdpi/top-left-inactive.png
new file mode 100644
index 0000000..91b0404
Binary files /dev/null and b/themes/default-hdpi/top-left-inactive.png differ
diff --git a/themes/default-hdpi/top-left-inactive.svg b/themes/default-hdpi/top-left-inactive.svg
new file mode 100644
index 0000000..c0b026f
--- /dev/null
+++ b/themes/default-hdpi/top-left-inactive.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="top-left-inactive.svg"
+   version="1.0"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:version="0.32"
+   id="svg2"
+   width="12"
+   height="43"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/top-left-inactive.xpm b/themes/default-hdpi/top-left-inactive.xpm
new file mode 100644
index 0000000..b74a4aa
--- /dev/null
+++ b/themes/default-hdpi/top-left-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"12 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"       .....",
+"     .......",
+"   .........",
+"  ..........",
+"  ..........",
+" ...........",
+" ...........",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............"};
diff --git a/themes/default-hdpi/top-right-active.png b/themes/default-hdpi/top-right-active.png
new file mode 100644
index 0000000..d875983
Binary files /dev/null and b/themes/default-hdpi/top-right-active.png differ
diff --git a/themes/default-hdpi/top-right-active.svg b/themes/default-hdpi/top-right-active.svg
new file mode 100644
index 0000000..48c9d9b
--- /dev/null
+++ b/themes/default-hdpi/top-right-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="top-right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata31" />
+  <defs
+     id="defs29" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview27" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 6.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/top-right-active.xpm b/themes/default-hdpi/top-right-active.xpm
new file mode 100644
index 0000000..2386055
--- /dev/null
+++ b/themes/default-hdpi/top-right-active.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"12 43 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+".....       ",
+".......     ",
+".........   ",
+"..........  ",
+"..........  ",
+"........... ",
+"........... ",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............"};
diff --git a/themes/default-hdpi/top-right-inactive.png b/themes/default-hdpi/top-right-inactive.png
new file mode 100644
index 0000000..c9cd585
Binary files /dev/null and b/themes/default-hdpi/top-right-inactive.png differ
diff --git a/themes/default-hdpi/top-right-inactive.svg b/themes/default-hdpi/top-right-inactive.svg
new file mode 100644
index 0000000..7b10500
--- /dev/null
+++ b/themes/default-hdpi/top-right-inactive.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="43"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="top-right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata25" />
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview21" />
+  <g
+     transform="scale(1.5)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
+         id="path1884" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 5.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-hdpi/top-right-inactive.xpm b/themes/default-hdpi/top-right-inactive.xpm
new file mode 100644
index 0000000..e400265
--- /dev/null
+++ b/themes/default-hdpi/top-right-inactive.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"12 43 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+".....       ",
+".......     ",
+".........   ",
+"..........  ",
+"..........  ",
+"........... ",
+"........... ",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............",
+"............"};
diff --git a/themes/kokodi/Makefile.am b/themes/default-xhdpi/Makefile.am
similarity index 98%
copy from themes/kokodi/Makefile.am
copy to themes/default-xhdpi/Makefile.am
index 808cbd2..5cd3e19 100644
--- a/themes/kokodi/Makefile.am
+++ b/themes/default-xhdpi/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Kokodi/xfwm4
+themedir = $(datadir)/themes/Default-xhdpi/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\
@@ -207,5 +207,5 @@ vacuum-defs:
 update-png:
 	for svg_file in $(SVG_FILES); do \
 		image=$${svg_file%.svg}; \
-		rsvg -f png $$svg_file $$image.png; \
+		rsvg-convert -f png $$svg_file > $$image.png; \
 	done
diff --git a/themes/default-xhdpi/README b/themes/default-xhdpi/README
new file mode 100644
index 0000000..80b8f6e
--- /dev/null
+++ b/themes/default-xhdpi/README
@@ -0,0 +1,4 @@
+SVG based theme for xfwm4.
+Created Sept. 2006 by Olivier Fourdan <fourdan at xfce.org>
+Modified Oct. 2014 by Olivier Fourdan <fourdan at xfce.org>
+Theme released under GNU GPL license.
diff --git a/themes/default-xhdpi/bottom-active.png b/themes/default-xhdpi/bottom-active.png
new file mode 100644
index 0000000..55ff21b
Binary files /dev/null and b/themes/default-xhdpi/bottom-active.png differ
diff --git a/themes/default-xhdpi/bottom-active.svg b/themes/default-xhdpi/bottom-active.svg
new file mode 100644
index 0000000..7c7face
--- /dev/null
+++ b/themes/default-xhdpi/bottom-active.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="12"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-points="true"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0,5.5 L 24,5.5"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-active.xpm b/themes/default-xhdpi/bottom-active.xpm
new file mode 100644
index 0000000..e3441eb
--- /dev/null
+++ b/themes/default-xhdpi/bottom-active.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"48 12 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-xhdpi/bottom-inactive.png b/themes/default-xhdpi/bottom-inactive.png
new file mode 100644
index 0000000..55ff21b
Binary files /dev/null and b/themes/default-xhdpi/bottom-inactive.png differ
diff --git a/themes/default-xhdpi/bottom-inactive.svg b/themes/default-xhdpi/bottom-inactive.svg
new file mode 100644
index 0000000..5dfa6c2
--- /dev/null
+++ b/themes/default-xhdpi/bottom-inactive.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="12"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-points="true"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0,5.5 L 24,5.5"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-inactive.xpm b/themes/default-xhdpi/bottom-inactive.xpm
new file mode 100644
index 0000000..d34fa58
--- /dev/null
+++ b/themes/default-xhdpi/bottom-inactive.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"48 12 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"################################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-xhdpi/bottom-left-active.png b/themes/default-xhdpi/bottom-left-active.png
new file mode 100644
index 0000000..a566118
Binary files /dev/null and b/themes/default-xhdpi/bottom-left-active.png differ
diff --git a/themes/default-xhdpi/bottom-left-active.svg b/themes/default-xhdpi/bottom-left-active.svg
new file mode 100644
index 0000000..0b34226
--- /dev/null
+++ b/themes/default-xhdpi/bottom-left-active.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-left-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+         id="rect1870" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-left-active.xpm b/themes/default-xhdpi/bottom-left-active.xpm
new file mode 100644
index 0000000..71a52de
--- /dev/null
+++ b/themes/default-xhdpi/bottom-left-active.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"32 32 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"    @@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-xhdpi/bottom-left-inactive.png b/themes/default-xhdpi/bottom-left-inactive.png
new file mode 100644
index 0000000..a566118
Binary files /dev/null and b/themes/default-xhdpi/bottom-left-inactive.png differ
diff --git a/themes/default-xhdpi/bottom-left-inactive.svg b/themes/default-xhdpi/bottom-left-inactive.svg
new file mode 100644
index 0000000..58c5c4a
--- /dev/null
+++ b/themes/default-xhdpi/bottom-left-inactive.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-left-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+         id="rect1870" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-left-inactive.xpm b/themes/default-xhdpi/bottom-left-inactive.xpm
new file mode 100644
index 0000000..c95f59c
--- /dev/null
+++ b/themes/default-xhdpi/bottom-left-inactive.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"32 32 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@########                    ",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+"@@@@############################",
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"    @@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default-xhdpi/bottom-right-active.png b/themes/default-xhdpi/bottom-right-active.png
new file mode 100644
index 0000000..1aeef2b
Binary files /dev/null and b/themes/default-xhdpi/bottom-right-active.png differ
diff --git a/themes/default-xhdpi/bottom-right-active.svg b/themes/default-xhdpi/bottom-right-active.svg
new file mode 100644
index 0000000..cd40ab2
--- /dev/null
+++ b/themes/default-xhdpi/bottom-right-active.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+         id="rect1870" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-right-active.xpm b/themes/default-xhdpi/bottom-right-active.xpm
new file mode 100644
index 0000000..d7ecf85
--- /dev/null
+++ b/themes/default-xhdpi/bottom-right-active.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"32 32 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@    "};
diff --git a/themes/default-xhdpi/bottom-right-inactive.png b/themes/default-xhdpi/bottom-right-inactive.png
new file mode 100644
index 0000000..1aeef2b
Binary files /dev/null and b/themes/default-xhdpi/bottom-right-inactive.png differ
diff --git a/themes/default-xhdpi/bottom-right-inactive.svg b/themes/default-xhdpi/bottom-right-inactive.svg
new file mode 100644
index 0000000..a89ad61
--- /dev/null
+++ b/themes/default-xhdpi/bottom-right-inactive.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="bottom-right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+         id="rect1870" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/bottom-right-inactive.xpm b/themes/default-xhdpi/bottom-right-inactive.xpm
new file mode 100644
index 0000000..ff6b4fc
--- /dev/null
+++ b/themes/default-xhdpi/bottom-right-inactive.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"32 32 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"                    ########@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"############################@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  ",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@    "};
diff --git a/themes/default-xhdpi/close-active.png b/themes/default-xhdpi/close-active.png
new file mode 100644
index 0000000..a6953a2
Binary files /dev/null and b/themes/default-xhdpi/close-active.png differ
diff --git a/themes/default-xhdpi/close-active.svg b/themes/default-xhdpi/close-active.svg
new file mode 100644
index 0000000..308b4df
--- /dev/null
+++ b/themes/default-xhdpi/close-active.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/close-active.xpm b/themes/default-xhdpi/close-active.xpm
new file mode 100644
index 0000000..6428094
--- /dev/null
+++ b/themes/default-xhdpi/close-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/close-inactive.png b/themes/default-xhdpi/close-inactive.png
new file mode 100644
index 0000000..2af1e1c
Binary files /dev/null and b/themes/default-xhdpi/close-inactive.png differ
diff --git a/themes/default-xhdpi/close-inactive.svg b/themes/default-xhdpi/close-inactive.svg
new file mode 100644
index 0000000..2b6beff
--- /dev/null
+++ b/themes/default-xhdpi/close-inactive.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
+  <defs
+     id="defs28" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview26" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(3,9)">
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/close-inactive.xpm b/themes/default-xhdpi/close-inactive.xpm
new file mode 100644
index 0000000..56192f8
--- /dev/null
+++ b/themes/default-xhdpi/close-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/close-prelight.png b/themes/default-xhdpi/close-prelight.png
new file mode 100644
index 0000000..3845776
Binary files /dev/null and b/themes/default-xhdpi/close-prelight.png differ
diff --git a/themes/default-xhdpi/close-prelight.svg b/themes/default-xhdpi/close-prelight.svg
new file mode 100644
index 0000000..8406749
--- /dev/null
+++ b/themes/default-xhdpi/close-prelight.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata42" />
+  <defs
+     id="defs40" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview38" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/close-prelight.xpm b/themes/default-xhdpi/close-prelight.xpm
new file mode 100644
index 0000000..6428094
--- /dev/null
+++ b/themes/default-xhdpi/close-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/close-pressed.png b/themes/default-xhdpi/close-pressed.png
new file mode 100644
index 0000000..ec60054
Binary files /dev/null and b/themes/default-xhdpi/close-pressed.png differ
diff --git a/themes/default-xhdpi/close-pressed.svg b/themes/default-xhdpi/close-pressed.svg
new file mode 100644
index 0000000..3f41b53
--- /dev/null
+++ b/themes/default-xhdpi/close-pressed.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="close-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata42" />
+  <defs
+     id="defs40" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview38" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,10)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/close-pressed.xpm b/themes/default-xhdpi/close-pressed.xpm
new file mode 100644
index 0000000..442257b
--- /dev/null
+++ b/themes/default-xhdpi/close-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/hide-active.png b/themes/default-xhdpi/hide-active.png
new file mode 100644
index 0000000..76ec20f
Binary files /dev/null and b/themes/default-xhdpi/hide-active.png differ
diff --git a/themes/default-xhdpi/hide-active.svg b/themes/default-xhdpi/hide-active.svg
new file mode 100644
index 0000000..feaefda
--- /dev/null
+++ b/themes/default-xhdpi/hide-active.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/hide-active.xpm b/themes/default-xhdpi/hide-active.xpm
new file mode 100644
index 0000000..90ce5a4
--- /dev/null
+++ b/themes/default-xhdpi/hide-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/hide-inactive.png b/themes/default-xhdpi/hide-inactive.png
new file mode 100644
index 0000000..e2d2d3f
Binary files /dev/null and b/themes/default-xhdpi/hide-inactive.png differ
diff --git a/themes/default-xhdpi/hide-inactive.svg b/themes/default-xhdpi/hide-inactive.svg
new file mode 100644
index 0000000..f184cab
--- /dev/null
+++ b/themes/default-xhdpi/hide-inactive.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <rect
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/hide-inactive.xpm b/themes/default-xhdpi/hide-inactive.xpm
new file mode 100644
index 0000000..426b66d
--- /dev/null
+++ b/themes/default-xhdpi/hide-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/hide-prelight.png b/themes/default-xhdpi/hide-prelight.png
new file mode 100644
index 0000000..792f83f
Binary files /dev/null and b/themes/default-xhdpi/hide-prelight.png differ
diff --git a/themes/default-xhdpi/hide-prelight.svg b/themes/default-xhdpi/hide-prelight.svg
new file mode 100644
index 0000000..5790ab2
--- /dev/null
+++ b/themes/default-xhdpi/hide-prelight.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/hide-prelight.xpm b/themes/default-xhdpi/hide-prelight.xpm
new file mode 100644
index 0000000..90ce5a4
--- /dev/null
+++ b/themes/default-xhdpi/hide-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/hide-pressed.png b/themes/default-xhdpi/hide-pressed.png
new file mode 100644
index 0000000..e743647
Binary files /dev/null and b/themes/default-xhdpi/hide-pressed.png differ
diff --git a/themes/default-xhdpi/hide-pressed.svg b/themes/default-xhdpi/hide-pressed.svg
new file mode 100644
index 0000000..58e9391
--- /dev/null
+++ b/themes/default-xhdpi/hide-pressed.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="hide-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/hide-pressed.xpm b/themes/default-xhdpi/hide-pressed.xpm
new file mode 100644
index 0000000..0f9bd78
--- /dev/null
+++ b/themes/default-xhdpi/hide-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/left-active.png b/themes/default-xhdpi/left-active.png
new file mode 100644
index 0000000..2bee22a
Binary files /dev/null and b/themes/default-xhdpi/left-active.png differ
diff --git a/themes/default-xhdpi/left-active.svg b/themes/default-xhdpi/left-active.svg
new file mode 100644
index 0000000..2d7aeae
--- /dev/null
+++ b/themes/default-xhdpi/left-active.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="left-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0 L 0.5,24"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/left-active.xpm b/themes/default-xhdpi/left-active.xpm
new file mode 100644
index 0000000..5c21fd2
--- /dev/null
+++ b/themes/default-xhdpi/left-active.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"12 48 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########"};
diff --git a/themes/default-xhdpi/left-inactive.png b/themes/default-xhdpi/left-inactive.png
new file mode 100644
index 0000000..2bee22a
Binary files /dev/null and b/themes/default-xhdpi/left-inactive.png differ
diff --git a/themes/default-xhdpi/left-inactive.svg b/themes/default-xhdpi/left-inactive.svg
new file mode 100644
index 0000000..7c9c865
--- /dev/null
+++ b/themes/default-xhdpi/left-inactive.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="left-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0 L 0.5,24"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/left-inactive.xpm b/themes/default-xhdpi/left-inactive.xpm
new file mode 100644
index 0000000..fa1951c
--- /dev/null
+++ b/themes/default-xhdpi/left-inactive.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"12 48 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########",
+"@@@@########"};
diff --git a/themes/default-xhdpi/maximize-active.png b/themes/default-xhdpi/maximize-active.png
new file mode 100644
index 0000000..34a6bc7
Binary files /dev/null and b/themes/default-xhdpi/maximize-active.png differ
diff --git a/themes/default-xhdpi/maximize-active.svg b/themes/default-xhdpi/maximize-active.svg
new file mode 100644
index 0000000..c9fbc3d
--- /dev/null
+++ b/themes/default-xhdpi/maximize-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-active.xpm b/themes/default-xhdpi/maximize-active.xpm
new file mode 100644
index 0000000..79de423
--- /dev/null
+++ b/themes/default-xhdpi/maximize-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-inactive.png b/themes/default-xhdpi/maximize-inactive.png
new file mode 100644
index 0000000..a86c8af
Binary files /dev/null and b/themes/default-xhdpi/maximize-inactive.png differ
diff --git a/themes/default-xhdpi/maximize-inactive.svg b/themes/default-xhdpi/maximize-inactive.svg
new file mode 100644
index 0000000..8e69f48
--- /dev/null
+++ b/themes/default-xhdpi/maximize-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(3,9)">
+        <path
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           id="rect2275" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-inactive.xpm b/themes/default-xhdpi/maximize-inactive.xpm
new file mode 100644
index 0000000..2981e12
--- /dev/null
+++ b/themes/default-xhdpi/maximize-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-prelight.png b/themes/default-xhdpi/maximize-prelight.png
new file mode 100644
index 0000000..b9b6a6d
Binary files /dev/null and b/themes/default-xhdpi/maximize-prelight.png differ
diff --git a/themes/default-xhdpi/maximize-prelight.svg b/themes/default-xhdpi/maximize-prelight.svg
new file mode 100644
index 0000000..d973db0
--- /dev/null
+++ b/themes/default-xhdpi/maximize-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-prelight.xpm b/themes/default-xhdpi/maximize-prelight.xpm
new file mode 100644
index 0000000..79de423
--- /dev/null
+++ b/themes/default-xhdpi/maximize-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-pressed.png b/themes/default-xhdpi/maximize-pressed.png
new file mode 100644
index 0000000..206c9a6
Binary files /dev/null and b/themes/default-xhdpi/maximize-pressed.png differ
diff --git a/themes/default-xhdpi/maximize-pressed.svg b/themes/default-xhdpi/maximize-pressed.svg
new file mode 100644
index 0000000..0cfc4dc
--- /dev/null
+++ b/themes/default-xhdpi/maximize-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,10)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-pressed.xpm b/themes/default-xhdpi/maximize-pressed.xpm
new file mode 100644
index 0000000..464c1e3
--- /dev/null
+++ b/themes/default-xhdpi/maximize-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-toggled-active.png b/themes/default-xhdpi/maximize-toggled-active.png
new file mode 100644
index 0000000..30fddf7
Binary files /dev/null and b/themes/default-xhdpi/maximize-toggled-active.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-active.svg b/themes/default-xhdpi/maximize-toggled-active.svg
new file mode 100644
index 0000000..2c4a4d6
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-active.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata37" />
+  <defs
+     id="defs35" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview33" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-toggled-active.xpm b/themes/default-xhdpi/maximize-toggled-active.xpm
new file mode 100644
index 0000000..59541ae
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.png b/themes/default-xhdpi/maximize-toggled-inactive.png
new file mode 100644
index 0000000..7910ff1
Binary files /dev/null and b/themes/default-xhdpi/maximize-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.svg b/themes/default-xhdpi/maximize-toggled-inactive.svg
new file mode 100644
index 0000000..d54e6ad
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-inactive.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
+  <defs
+     id="defs28" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview26" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1639"
+         transform="translate(3,9)">
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-toggled-inactive.xpm b/themes/default-xhdpi/maximize-toggled-inactive.xpm
new file mode 100644
index 0000000..4cfc203
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_toggled_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.png b/themes/default-xhdpi/maximize-toggled-prelight.png
new file mode 100644
index 0000000..edaab25
Binary files /dev/null and b/themes/default-xhdpi/maximize-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.svg b/themes/default-xhdpi/maximize-toggled-prelight.svg
new file mode 100644
index 0000000..d38f8b8
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-prelight.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview36" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-toggled-prelight.xpm b/themes/default-xhdpi/maximize-toggled-prelight.xpm
new file mode 100644
index 0000000..59541ae
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.png b/themes/default-xhdpi/maximize-toggled-pressed.png
new file mode 100644
index 0000000..d6b96a2
Binary files /dev/null and b/themes/default-xhdpi/maximize-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.svg b/themes/default-xhdpi/maximize-toggled-pressed.svg
new file mode 100644
index 0000000..f32f6d5
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-pressed.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="maximize-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview36" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,10)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/maximize-toggled-pressed.xpm b/themes/default-xhdpi/maximize-toggled-pressed.xpm
new file mode 100644
index 0000000..ee2e343
--- /dev/null
+++ b/themes/default-xhdpi/maximize-toggled-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/menu-active.png b/themes/default-xhdpi/menu-active.png
new file mode 100644
index 0000000..90ccbba
Binary files /dev/null and b/themes/default-xhdpi/menu-active.png differ
diff --git a/themes/default-xhdpi/menu-active.svg b/themes/default-xhdpi/menu-active.svg
new file mode 100644
index 0000000..01d8fd7
--- /dev/null
+++ b/themes/default-xhdpi/menu-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/menu-active.xpm b/themes/default-xhdpi/menu-active.xpm
new file mode 100644
index 0000000..5d923c8
--- /dev/null
+++ b/themes/default-xhdpi/menu-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/menu-inactive.png b/themes/default-xhdpi/menu-inactive.png
new file mode 100644
index 0000000..90ccbba
Binary files /dev/null and b/themes/default-xhdpi/menu-inactive.png differ
diff --git a/themes/default-xhdpi/menu-inactive.svg b/themes/default-xhdpi/menu-inactive.svg
new file mode 100644
index 0000000..abeb3a6
--- /dev/null
+++ b/themes/default-xhdpi/menu-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/menu-inactive.xpm b/themes/default-xhdpi/menu-inactive.xpm
new file mode 100644
index 0000000..b355e36
--- /dev/null
+++ b/themes/default-xhdpi/menu-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/menu-prelight.png b/themes/default-xhdpi/menu-prelight.png
new file mode 100644
index 0000000..90ccbba
Binary files /dev/null and b/themes/default-xhdpi/menu-prelight.png differ
diff --git a/themes/default-xhdpi/menu-prelight.svg b/themes/default-xhdpi/menu-prelight.svg
new file mode 100644
index 0000000..849cf13
--- /dev/null
+++ b/themes/default-xhdpi/menu-prelight.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/menu-prelight.xpm b/themes/default-xhdpi/menu-prelight.xpm
new file mode 100644
index 0000000..5d923c8
--- /dev/null
+++ b/themes/default-xhdpi/menu-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/menu-pressed.png b/themes/default-xhdpi/menu-pressed.png
new file mode 100644
index 0000000..90ccbba
Binary files /dev/null and b/themes/default-xhdpi/menu-pressed.png differ
diff --git a/themes/default-xhdpi/menu-pressed.svg b/themes/default-xhdpi/menu-pressed.svg
new file mode 100644
index 0000000..a6dc8e4
--- /dev/null
+++ b/themes/default-xhdpi/menu-pressed.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="menu-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/menu-pressed.xpm b/themes/default-xhdpi/menu-pressed.xpm
new file mode 100644
index 0000000..2642edf
--- /dev/null
+++ b/themes/default-xhdpi/menu-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/right-active.png b/themes/default-xhdpi/right-active.png
new file mode 100644
index 0000000..0ec016a
Binary files /dev/null and b/themes/default-xhdpi/right-active.png differ
diff --git a/themes/default-xhdpi/right-active.svg b/themes/default-xhdpi/right-active.svg
new file mode 100644
index 0000000..0bba2c5
--- /dev/null
+++ b/themes/default-xhdpi/right-active.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 5.5,0 L 5.5,24"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/right-active.xpm b/themes/default-xhdpi/right-active.xpm
new file mode 100644
index 0000000..926ca79
--- /dev/null
+++ b/themes/default-xhdpi/right-active.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"12 48 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@"};
diff --git a/themes/default-xhdpi/right-inactive.png b/themes/default-xhdpi/right-inactive.png
new file mode 100644
index 0000000..0ec016a
Binary files /dev/null and b/themes/default-xhdpi/right-inactive.png differ
diff --git a/themes/default-xhdpi/right-inactive.svg b/themes/default-xhdpi/right-inactive.svg
new file mode 100644
index 0000000..e2bcf18
--- /dev/null
+++ b/themes/default-xhdpi/right-inactive.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview10" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 5.5,0 L 5.5,24"
+         id="path1340" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/right-inactive.xpm b/themes/default-xhdpi/right-inactive.xpm
new file mode 100644
index 0000000..faa6e99
--- /dev/null
+++ b/themes/default-xhdpi/right-inactive.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"12 48 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@",
+"########@@@@"};
diff --git a/themes/default-xhdpi/shade-active.png b/themes/default-xhdpi/shade-active.png
new file mode 100644
index 0000000..6425b92
Binary files /dev/null and b/themes/default-xhdpi/shade-active.png differ
diff --git a/themes/default-xhdpi/shade-active.svg b/themes/default-xhdpi/shade-active.svg
new file mode 100644
index 0000000..287336d
--- /dev/null
+++ b/themes/default-xhdpi/shade-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-active.xpm b/themes/default-xhdpi/shade-active.xpm
new file mode 100644
index 0000000..edc8ff1
--- /dev/null
+++ b/themes/default-xhdpi/shade-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-inactive.png b/themes/default-xhdpi/shade-inactive.png
new file mode 100644
index 0000000..0b15c75
Binary files /dev/null and b/themes/default-xhdpi/shade-inactive.png differ
diff --git a/themes/default-xhdpi/shade-inactive.svg b/themes/default-xhdpi/shade-inactive.svg
new file mode 100644
index 0000000..868593c
--- /dev/null
+++ b/themes/default-xhdpi/shade-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-inactive.xpm b/themes/default-xhdpi/shade-inactive.xpm
new file mode 100644
index 0000000..2fa9500
--- /dev/null
+++ b/themes/default-xhdpi/shade-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-prelight.png b/themes/default-xhdpi/shade-prelight.png
new file mode 100644
index 0000000..2b41e5c
Binary files /dev/null and b/themes/default-xhdpi/shade-prelight.png differ
diff --git a/themes/default-xhdpi/shade-prelight.svg b/themes/default-xhdpi/shade-prelight.svg
new file mode 100644
index 0000000..ebd0107
--- /dev/null
+++ b/themes/default-xhdpi/shade-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-prelight.xpm b/themes/default-xhdpi/shade-prelight.xpm
new file mode 100644
index 0000000..edc8ff1
--- /dev/null
+++ b/themes/default-xhdpi/shade-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-pressed.png b/themes/default-xhdpi/shade-pressed.png
new file mode 100644
index 0000000..27b20db
Binary files /dev/null and b/themes/default-xhdpi/shade-pressed.png differ
diff --git a/themes/default-xhdpi/shade-pressed.svg b/themes/default-xhdpi/shade-pressed.svg
new file mode 100644
index 0000000..e158ec6
--- /dev/null
+++ b/themes/default-xhdpi/shade-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-pressed.xpm b/themes/default-xhdpi/shade-pressed.xpm
new file mode 100644
index 0000000..ef6866a
--- /dev/null
+++ b/themes/default-xhdpi/shade-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-toggled-active.png b/themes/default-xhdpi/shade-toggled-active.png
new file mode 100644
index 0000000..e4f4988
Binary files /dev/null and b/themes/default-xhdpi/shade-toggled-active.png differ
diff --git a/themes/default-xhdpi/shade-toggled-active.svg b/themes/default-xhdpi/shade-toggled-active.svg
new file mode 100644
index 0000000..88c9b88
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-toggled-active.xpm b/themes/default-xhdpi/shade-toggled-active.xpm
new file mode 100644
index 0000000..c35e22d
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-toggled-inactive.png b/themes/default-xhdpi/shade-toggled-inactive.png
new file mode 100644
index 0000000..81a1750
Binary files /dev/null and b/themes/default-xhdpi/shade-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/shade-toggled-inactive.svg b/themes/default-xhdpi/shade-toggled-inactive.svg
new file mode 100644
index 0000000..1bb2afe
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-toggled-inactive.xpm b/themes/default-xhdpi/shade-toggled-inactive.xpm
new file mode 100644
index 0000000..cd4f2c8
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_toggled_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-toggled-prelight.png b/themes/default-xhdpi/shade-toggled-prelight.png
new file mode 100644
index 0000000..ad2de9a
Binary files /dev/null and b/themes/default-xhdpi/shade-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/shade-toggled-prelight.svg b/themes/default-xhdpi/shade-toggled-prelight.svg
new file mode 100644
index 0000000..c5c46c0
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-toggled-prelight.xpm b/themes/default-xhdpi/shade-toggled-prelight.xpm
new file mode 100644
index 0000000..c35e22d
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/shade-toggled-pressed.png b/themes/default-xhdpi/shade-toggled-pressed.png
new file mode 100644
index 0000000..2eeeaac
Binary files /dev/null and b/themes/default-xhdpi/shade-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/shade-toggled-pressed.svg b/themes/default-xhdpi/shade-toggled-pressed.svg
new file mode 100644
index 0000000..3786d7a
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="shade-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,10)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/shade-toggled-pressed.xpm b/themes/default-xhdpi/shade-toggled-pressed.xpm
new file mode 100644
index 0000000..b60fc23
--- /dev/null
+++ b/themes/default-xhdpi/shade-toggled-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * shade_toggled_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-active.png b/themes/default-xhdpi/stick-active.png
new file mode 100644
index 0000000..0a15dee
Binary files /dev/null and b/themes/default-xhdpi/stick-active.png differ
diff --git a/themes/default-xhdpi/stick-active.svg b/themes/default-xhdpi/stick-active.svg
new file mode 100644
index 0000000..f718282
--- /dev/null
+++ b/themes/default-xhdpi/stick-active.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview32" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-active.xpm b/themes/default-xhdpi/stick-active.xpm
new file mode 100644
index 0000000..681092c
--- /dev/null
+++ b/themes/default-xhdpi/stick-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-inactive.png b/themes/default-xhdpi/stick-inactive.png
new file mode 100644
index 0000000..0d1963f
Binary files /dev/null and b/themes/default-xhdpi/stick-inactive.png differ
diff --git a/themes/default-xhdpi/stick-inactive.svg b/themes/default-xhdpi/stick-inactive.svg
new file mode 100644
index 0000000..38e443d
--- /dev/null
+++ b/themes/default-xhdpi/stick-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview25" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-inactive.xpm b/themes/default-xhdpi/stick-inactive.xpm
new file mode 100644
index 0000000..f824212
--- /dev/null
+++ b/themes/default-xhdpi/stick-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-prelight.png b/themes/default-xhdpi/stick-prelight.png
new file mode 100644
index 0000000..727f0d2
Binary files /dev/null and b/themes/default-xhdpi/stick-prelight.png differ
diff --git a/themes/default-xhdpi/stick-prelight.svg b/themes/default-xhdpi/stick-prelight.svg
new file mode 100644
index 0000000..24cbf34
--- /dev/null
+++ b/themes/default-xhdpi/stick-prelight.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-prelight.xpm b/themes/default-xhdpi/stick-prelight.xpm
new file mode 100644
index 0000000..681092c
--- /dev/null
+++ b/themes/default-xhdpi/stick-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-pressed.png b/themes/default-xhdpi/stick-pressed.png
new file mode 100644
index 0000000..acf730c
Binary files /dev/null and b/themes/default-xhdpi/stick-pressed.png differ
diff --git a/themes/default-xhdpi/stick-pressed.svg b/themes/default-xhdpi/stick-pressed.svg
new file mode 100644
index 0000000..d31f9d6
--- /dev/null
+++ b/themes/default-xhdpi/stick-pressed.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
+  <defs
+     id="defs37" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview35" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-pressed.xpm b/themes/default-xhdpi/stick-pressed.xpm
new file mode 100644
index 0000000..225392f
--- /dev/null
+++ b/themes/default-xhdpi/stick-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-toggled-active.png b/themes/default-xhdpi/stick-toggled-active.png
new file mode 100644
index 0000000..7ef6549
Binary files /dev/null and b/themes/default-xhdpi/stick-toggled-active.png differ
diff --git a/themes/default-xhdpi/stick-toggled-active.svg b/themes/default-xhdpi/stick-toggled-active.svg
new file mode 100644
index 0000000..d94adcf
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-active.svg
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata37" />
+  <defs
+     id="defs35" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview33" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-toggled-active.xpm b/themes/default-xhdpi/stick-toggled-active.xpm
new file mode 100644
index 0000000..a394d48
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-active.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-toggled-inactive.png b/themes/default-xhdpi/stick-toggled-inactive.png
new file mode 100644
index 0000000..2e33478
Binary files /dev/null and b/themes/default-xhdpi/stick-toggled-inactive.png differ
diff --git a/themes/default-xhdpi/stick-toggled-inactive.svg b/themes/default-xhdpi/stick-toggled-inactive.svg
new file mode 100644
index 0000000..ac6c3e5
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-inactive.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
+  <defs
+     id="defs28" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview26" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2202"
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-toggled-inactive.xpm b/themes/default-xhdpi/stick-toggled-inactive.xpm
new file mode 100644
index 0000000..810d9bf
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-inactive.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_toggled_inactive_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-toggled-prelight.png b/themes/default-xhdpi/stick-toggled-prelight.png
new file mode 100644
index 0000000..171ff67
Binary files /dev/null and b/themes/default-xhdpi/stick-toggled-prelight.png differ
diff --git a/themes/default-xhdpi/stick-toggled-prelight.svg b/themes/default-xhdpi/stick-toggled-prelight.svg
new file mode 100644
index 0000000..12b5a0b
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-prelight.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview36" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-toggled-prelight.xpm b/themes/default-xhdpi/stick-toggled-prelight.xpm
new file mode 100644
index 0000000..a394d48
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-prelight.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/stick-toggled-pressed.png b/themes/default-xhdpi/stick-toggled-pressed.png
new file mode 100644
index 0000000..a814b30
Binary files /dev/null and b/themes/default-xhdpi/stick-toggled-pressed.png differ
diff --git a/themes/default-xhdpi/stick-toggled-pressed.svg b/themes/default-xhdpi/stick-toggled-pressed.svg
new file mode 100644
index 0000000..6bd3529
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-pressed.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="44"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="stick-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview36" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/stick-toggled-pressed.xpm b/themes/default-xhdpi/stick-toggled-pressed.xpm
new file mode 100644
index 0000000..a972c5d
--- /dev/null
+++ b/themes/default-xhdpi/stick-toggled-pressed.xpm
@@ -0,0 +1,62 @@
+/* XPM */
+static char * stick_toggled_pressed_xpm[] = {
+"44 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................",
+"............................................"};
diff --git a/themes/default-xhdpi/themerc b/themes/default-xhdpi/themerc
new file mode 100644
index 0000000..26fcc46
--- /dev/null
+++ b/themes/default-xhdpi/themerc
@@ -0,0 +1,14 @@
+active_text_color=#0c0c0f
+active_text_shadow_color=#fcfcff
+inactive_text_color=#6c6c70
+inactive_text_shadow_color=#fcfcff
+button_offset=0
+button_spacing=0
+full_width_title=true
+maximized_offset=0
+show_app_icon=true
+title_horizontal_offset=2
+title_shadow_active=under
+title_shadow_inactive=under
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2
diff --git a/themes/default-xhdpi/title-1-active.png b/themes/default-xhdpi/title-1-active.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-1-active.png differ
diff --git a/themes/default-xhdpi/title-1-active.svg b/themes/default-xhdpi/title-1-active.svg
new file mode 100644
index 0000000..9f626ef
--- /dev/null
+++ b/themes/default-xhdpi/title-1-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-1-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-1-active.xpm b/themes/default-xhdpi/title-1-active.xpm
new file mode 100644
index 0000000..9468f21
--- /dev/null
+++ b/themes/default-xhdpi/title-1-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-1-inactive.png b/themes/default-xhdpi/title-1-inactive.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-1-inactive.png differ
diff --git a/themes/default-xhdpi/title-1-inactive.svg b/themes/default-xhdpi/title-1-inactive.svg
new file mode 100644
index 0000000..01d62bd
--- /dev/null
+++ b/themes/default-xhdpi/title-1-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-1-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-1-inactive.xpm b/themes/default-xhdpi/title-1-inactive.xpm
new file mode 100644
index 0000000..977205f
--- /dev/null
+++ b/themes/default-xhdpi/title-1-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-2-active.png b/themes/default-xhdpi/title-2-active.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-2-active.png differ
diff --git a/themes/default-xhdpi/title-2-active.svg b/themes/default-xhdpi/title-2-active.svg
new file mode 100644
index 0000000..f3bbf08
--- /dev/null
+++ b/themes/default-xhdpi/title-2-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-2-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-2-active.xpm b/themes/default-xhdpi/title-2-active.xpm
new file mode 100644
index 0000000..9468f21
--- /dev/null
+++ b/themes/default-xhdpi/title-2-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-2-inactive.png b/themes/default-xhdpi/title-2-inactive.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-2-inactive.png differ
diff --git a/themes/default-xhdpi/title-2-inactive.svg b/themes/default-xhdpi/title-2-inactive.svg
new file mode 100644
index 0000000..726a985
--- /dev/null
+++ b/themes/default-xhdpi/title-2-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-2-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-2-inactive.xpm b/themes/default-xhdpi/title-2-inactive.xpm
new file mode 100644
index 0000000..977205f
--- /dev/null
+++ b/themes/default-xhdpi/title-2-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-3-active.png b/themes/default-xhdpi/title-3-active.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-3-active.png differ
diff --git a/themes/default-xhdpi/title-3-active.svg b/themes/default-xhdpi/title-3-active.svg
new file mode 100644
index 0000000..7584f83
--- /dev/null
+++ b/themes/default-xhdpi/title-3-active.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-3-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer2"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-3-active.xpm b/themes/default-xhdpi/title-3-active.xpm
new file mode 100644
index 0000000..9468f21
--- /dev/null
+++ b/themes/default-xhdpi/title-3-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-3-inactive.png b/themes/default-xhdpi/title-3-inactive.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-3-inactive.png differ
diff --git a/themes/default-xhdpi/title-3-inactive.svg b/themes/default-xhdpi/title-3-inactive.svg
new file mode 100644
index 0000000..0eea5e1
--- /dev/null
+++ b/themes/default-xhdpi/title-3-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-3-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-3-inactive.xpm b/themes/default-xhdpi/title-3-inactive.xpm
new file mode 100644
index 0000000..977205f
--- /dev/null
+++ b/themes/default-xhdpi/title-3-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-4-active.png b/themes/default-xhdpi/title-4-active.png
new file mode 100644
index 0000000..88109a7
Binary files /dev/null and b/themes/default-xhdpi/title-4-active.png differ
diff --git a/themes/default-xhdpi/title-4-active.svg b/themes/default-xhdpi/title-4-active.svg
new file mode 100644
index 0000000..6d7c217
--- /dev/null
+++ b/themes/default-xhdpi/title-4-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-4-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
+  <defs
+     id="defs30" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview28" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-4-active.xpm b/themes/default-xhdpi/title-4-active.xpm
new file mode 100644
index 0000000..9468f21
--- /dev/null
+++ b/themes/default-xhdpi/title-4-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-4-inactive.png b/themes/default-xhdpi/title-4-inactive.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-4-inactive.png differ
diff --git a/themes/default-xhdpi/title-4-inactive.svg b/themes/default-xhdpi/title-4-inactive.svg
new file mode 100644
index 0000000..0007333
--- /dev/null
+++ b/themes/default-xhdpi/title-4-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-4-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-4-inactive.xpm b/themes/default-xhdpi/title-4-inactive.xpm
new file mode 100644
index 0000000..977205f
--- /dev/null
+++ b/themes/default-xhdpi/title-4-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-5-active.png b/themes/default-xhdpi/title-5-active.png
new file mode 100644
index 0000000..2bad2f8
Binary files /dev/null and b/themes/default-xhdpi/title-5-active.png differ
diff --git a/themes/default-xhdpi/title-5-active.svg b/themes/default-xhdpi/title-5-active.svg
new file mode 100644
index 0000000..1038a35
--- /dev/null
+++ b/themes/default-xhdpi/title-5-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-5-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
+  <defs
+     id="defs30" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview28" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 7.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-5-active.xpm b/themes/default-xhdpi/title-5-active.xpm
new file mode 100644
index 0000000..9468f21
--- /dev/null
+++ b/themes/default-xhdpi/title-5-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_active_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/title-5-inactive.png b/themes/default-xhdpi/title-5-inactive.png
new file mode 100644
index 0000000..7fa2e8b
Binary files /dev/null and b/themes/default-xhdpi/title-5-inactive.png differ
diff --git a/themes/default-xhdpi/title-5-inactive.svg b/themes/default-xhdpi/title-5-inactive.svg
new file mode 100644
index 0000000..f2ec3d9
--- /dev/null
+++ b/themes/default-xhdpi/title-5-inactive.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="title-5-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/title-5-inactive.xpm b/themes/default-xhdpi/title-5-inactive.xpm
new file mode 100644
index 0000000..977205f
--- /dev/null
+++ b/themes/default-xhdpi/title-5-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * title_inactive_xpm[] = {
+"8 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default-xhdpi/top-left-active.png b/themes/default-xhdpi/top-left-active.png
new file mode 100644
index 0000000..72e85f8
Binary files /dev/null and b/themes/default-xhdpi/top-left-active.png differ
diff --git a/themes/default-xhdpi/top-left-active.svg b/themes/default-xhdpi/top-left-active.svg
new file mode 100644
index 0000000..c62c5a6
--- /dev/null
+++ b/themes/default-xhdpi/top-left-active.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="top-left-active.svg"
+   version="1.0"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:version="0.32"
+   id="svg2"
+   width="16"
+   height="58"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/top-left-active.xpm b/themes/default-xhdpi/top-left-active.xpm
new file mode 100644
index 0000000..21007d5
--- /dev/null
+++ b/themes/default-xhdpi/top-left-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"16 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"        ........",
+"      ..........",
+"    ............",
+"   .............",
+"  ..............",
+"  ..............",
+" ...............",
+" ...............",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"}
diff --git a/themes/default-xhdpi/top-left-inactive.png b/themes/default-xhdpi/top-left-inactive.png
new file mode 100644
index 0000000..72e85f8
Binary files /dev/null and b/themes/default-xhdpi/top-left-inactive.png differ
diff --git a/themes/default-xhdpi/top-left-inactive.svg b/themes/default-xhdpi/top-left-inactive.svg
new file mode 100644
index 0000000..5e38b37
--- /dev/null
+++ b/themes/default-xhdpi/top-left-inactive.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="top-left-inactive.svg"
+   version="1.0"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:version="0.32"
+   id="svg2"
+   width="16"
+   height="58"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/top-left-inactive.xpm b/themes/default-xhdpi/top-left-inactive.xpm
new file mode 100644
index 0000000..0ea3721
--- /dev/null
+++ b/themes/default-xhdpi/top-left-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"16 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"        ........",
+"      ..........",
+"    ............",
+"   .............",
+"  ..............",
+"  ..............",
+" ...............",
+" ...............",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"}
diff --git a/themes/default-xhdpi/top-right-active.png b/themes/default-xhdpi/top-right-active.png
new file mode 100644
index 0000000..833a6c7
Binary files /dev/null and b/themes/default-xhdpi/top-right-active.png differ
diff --git a/themes/default-xhdpi/top-right-active.svg b/themes/default-xhdpi/top-right-active.svg
new file mode 100644
index 0000000..23b70d1
--- /dev/null
+++ b/themes/default-xhdpi/top-right-active.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="top-right-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
+  <defs
+     id="defs30" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview28" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 6.5,26.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/top-right-active.xpm b/themes/default-xhdpi/top-right-active.xpm
new file mode 100644
index 0000000..ba9800f
--- /dev/null
+++ b/themes/default-xhdpi/top-right-active.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"16 58 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"........        ",
+"..........      ",
+"............    ",
+".............   ",
+"..............  ",
+"..............  ",
+"............... ",
+"............... ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"}
diff --git a/themes/default-xhdpi/top-right-inactive.png b/themes/default-xhdpi/top-right-inactive.png
new file mode 100644
index 0000000..843f1c6
Binary files /dev/null and b/themes/default-xhdpi/top-right-inactive.png differ
diff --git a/themes/default-xhdpi/top-right-inactive.svg b/themes/default-xhdpi/top-right-inactive.svg
new file mode 100644
index 0000000..3860fd5
--- /dev/null
+++ b/themes/default-xhdpi/top-right-inactive.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="58"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="top-right-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22" />
+  <g
+     transform="scale(2)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
+         id="path1884" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 5.5,28.5"
+         id="path6989" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default-xhdpi/top-right-inactive.xpm b/themes/default-xhdpi/top-right-inactive.xpm
new file mode 100644
index 0000000..d092b96
--- /dev/null
+++ b/themes/default-xhdpi/top-right-inactive.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"16 58 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"........        ",
+"..........      ",
+"............    ",
+".............   ",
+"..............  ",
+"..............  ",
+"............... ",
+"............... ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"}
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index 3519467..9394017 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -207,5 +207,5 @@ vacuum-defs:
 update-png:
 	for svg_file in $(SVG_FILES); do \
 		image=$${svg_file%.svg}; \
-		rsvg -f png $$svg_file $$image.png; \
+		rsvg-convert -f png $$svg_file > $$image.png; \
 	done
diff --git a/themes/default/README b/themes/default/README
index ea23f10..80b8f6e 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,3 +1,4 @@
-joy - SVG based theme for xfwm4.
-(c) 2006, 2010 - Olivier Fourdan <fourdan at xfce.org>
+SVG based theme for xfwm4.
+Created Sept. 2006 by Olivier Fourdan <fourdan at xfce.org>
+Modified Oct. 2014 by Olivier Fourdan <fourdan at xfce.org>
 Theme released under GNU GPL license.
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 7b552a0..07a9e01 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
index 9fa12d2..7675176 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -10,59 +10,96 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="4"
+   height="3"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-points="true"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,3.5 L 23.5,3.5"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-points="true"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0,2.5 L 24,2.5"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index bc12e65..1dabfc9 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,10 +1,9 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"24 4 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"########################",
-"########################",
-"########################",
+"24 3 3 1",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index 7b552a0..07a9e01 100644
Binary files a/themes/default/bottom-inactive.png and b/themes/default/bottom-inactive.png differ
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
index b93e962..9a2b39b 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -10,59 +10,96 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="4"
+   height="3"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-points="true"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,3.5 L 23.5,3.5"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-points="true"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0,2.5 L 24,2.5"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 6066037..6e6ac79 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,10 +1,9 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"24 4 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"########################",
-"########################",
-"########################",
+"24 3 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 3b25532..c842297 100644
Binary files a/themes/default/bottom-left-active.png and b/themes/default/bottom-left-active.png differ
diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg
index ab11400..950411c 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -13,55 +13,92 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#a0a0a0;fill-opacity:0.25"
-       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
-       id="rect1870" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+         id="rect1870" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index f5a0bf1..5840ca8 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -1,22 +1,22 @@
 /* XPM */
 static char * bottom_left_active_xpm[] = {
 "16 16 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@###############",
-"@###############",
-"@###############",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 3b25532..c842297 100644
Binary files a/themes/default/bottom-left-inactive.png and b/themes/default/bottom-left-inactive.png differ
diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg
index 58a8fe4..82063ae 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -13,55 +13,92 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#a0a0a0;fill-opacity:0.25"
-       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
-       id="rect1870" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+         id="rect1870" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 9c468d1..0c98e92 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -1,22 +1,22 @@
 /* XPM */
 static char * bottom_left_inactive_xpm[] = {
 "16 16 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@               ",
-"@###############",
-"@###############",
-"@###############",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@             ",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index 0fd9ff2..de3ab3c 100644
Binary files a/themes/default/bottom-right-active.png and b/themes/default/bottom-right-active.png differ
diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg
index 3899fd0..0a0ae1c 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -13,55 +13,92 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#a0a0a0;fill-opacity:0.25"
-       d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
-       id="rect1870" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+         id="rect1870" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 90b41d4..8d21c54 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -1,22 +1,22 @@
 /* XPM */
 static char * bottom_right_active_xpm[] = {
 "16 16 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"###############@",
-"###############@",
-"###############@",
+"       c None",
+"#      c #C0C0C0 s active_color_2",
+"@      c #C0C0FF s active_color_2",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index 0fd9ff2..de3ab3c 100644
Binary files a/themes/default/bottom-right-inactive.png and b/themes/default/bottom-right-inactive.png differ
diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg
index 7ea54d2..9e5b433 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -13,55 +13,92 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="bottom-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#a0a0a0;fill-opacity:0.25"
-       d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
-       id="rect1870" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:grid-points="true" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:black;fill-opacity:0.50"
+         d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+         id="rect1870" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 7edfc35..7936ff1 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -1,22 +1,22 @@
 /* XPM */
 static char * bottom_right_inactive_xpm[] = {
 "16 16 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"               @",
-"###############@",
-"###############@",
-"###############@",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"             @@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index fb7f616..b93c7d0 100644
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
index fef64c4..9ecc7a3 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -10,212 +10,214 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="close-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
     <g
-       id="g2328"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
       <g
-         transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="g2217">
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,2 L 10,10"
-           id="path1340" />
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,10 L 10,2"
-           id="path2215" />
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2221"
-         d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path2225"
-         d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 19692c1..939cfc2 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index a5870bd..eeb352e 100644
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
index b1acbf6..f008a8f 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -10,199 +10,172 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="close-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs28" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview26" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       id="g2328"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="path2221"
-         d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(3,9)">
+        <path
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <path
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2225"
-         d="M 2.5,9.5 L 9.5,2.5"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 829f6f6..c45a794 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index 02d0d06..24b986b 100644
Binary files a/themes/default/close-prelight.png and b/themes/default/close-prelight.png differ
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
index 4c5aca9..a9812f4 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -10,226 +10,232 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="close-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata42" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs40" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview38" />
   <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ff6060;fill-rule:evenodd;stroke:#ff6060;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       id="g2328"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
       <g
-         transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="g2217">
+         id="g2327"
+         transform="translate(5,9)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,2 L 10,10"
-           id="path1340" />
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,10 L 10,2"
-           id="path2215" />
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2221"
-         d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path2225"
-         d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index 19692c1..939cfc2 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 0ca6417..6b25ee4 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg
index ae94b9b..d9f2993 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -10,226 +10,232 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="close-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata42" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs40" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview38" />
   <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       id="g2328"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
       <g
-         transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="g2217">
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#a02020;fill-rule:evenodd;stroke:#a02020;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.35;fill-opacity:0.35;opacity:0.60"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         id="g2327"
+         transform="translate(5,10)">
+        <g
+           transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+           style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g2217">
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,2 L 10,10"
+             id="path1340" />
+          <path
+             style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 2,10 L 10,2"
+             id="path2215" />
+        </g>
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,2 L 10,10"
-           id="path1340" />
+           id="path2221"
+           d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 2,10 L 10,2"
-           id="path2215" />
+           id="path2225"
+           d="M 2.5,9.5 L 9.5,2.5"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2221"
-         d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path2225"
-         d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 19692c1..fb28512 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * close_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * close_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index ad7b41e..a4112cc 100644
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
index 9fa9124..35de20a 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -10,206 +10,208 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="hide-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs34" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview32" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
-      <rect
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2376"
-         width="8"
-         height="4"
-         x="2"
-         y="7" />
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
       <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2378"
-         width="6"
-         height="2"
-         x="3"
-         y="8" />
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 57cee05..b5a87f2 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index 4077a77..6f97c28 100644
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
index 5dec684..b4f44a1 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -10,199 +10,172 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="hide-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs27" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview25" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
       <rect
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2378"
-         width="6"
-         height="2"
-         x="3"
-         y="8" />
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <rect
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 537ca53..381d958 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index 9777afc..147f235 100644
Binary files a/themes/default/hide-prelight.png and b/themes/default/hide-prelight.png differ
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
index 4a537a9..311ba13 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -10,220 +10,226 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="hide-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
-      <rect
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2376"
-         width="8"
-         height="4"
-         x="2"
-         y="7" />
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
       <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2378"
-         width="6"
-         height="2"
-         x="3"
-         y="8" />
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index 57cee05..b5a87f2 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index 28d5d67..2062b72 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
index 2a34215..e29342a 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -10,220 +10,226 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="hide-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,7)">
-      <rect
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2376"
-         width="8"
-         height="4"
-         x="2"
-         y="7" />
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
       <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="rect2378"
-         width="6"
-         height="2"
-         x="3"
-         y="8" />
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <rect
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2376"
+           width="8"
+           height="4"
+           x="2"
+           y="7" />
+        <rect
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect2378"
+           width="6"
+           height="2"
+           x="3"
+           y="8" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 57cee05..b28a096 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * hide_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * hide_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index cd764b6..240b499 100644
Binary files a/themes/default/left-active.png and b/themes/default/left-active.png differ
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
index 55ac0de..3956e53 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -9,58 +9,95 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1"
+   width="3"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,0 L 0.5,24"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0 L 0.5,24"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 144b454..597a083 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"1 24 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@"};
+"3 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index cd764b6..240b499 100644
Binary files a/themes/default/left-inactive.png and b/themes/default/left-inactive.png differ
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
index 609bd77..7fb4008 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -9,58 +9,95 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1"
+   width="3"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,0 L 0.5,24"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0 L 0.5,24"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index dc68e60..ece3de2 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"1 24 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@"};
+"3 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index f728a76..2df894a 100644
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
index ba88e33..8cd5ea8 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -10,200 +10,202 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs34" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview32" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="rect2246"
-         d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2285"
-         d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 1869ca4..1820996 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index eb721f0..983629b 100644
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
index 903714f..8ce2b97 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -10,196 +10,169 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs27" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview25" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(3,9)">
+        <path
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           id="rect2275" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         id="rect2285" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 8af0abd..c131926 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index a11fc95..09a6813 100644
Binary files a/themes/default/maximize-prelight.png and b/themes/default/maximize-prelight.png differ
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
index ddb9fcf..0c875fd 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="rect2246"
-         d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,9)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2285"
-         d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index 1869ca4..1820996 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index c29fa58..d8c2319 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg
index 9b8ab39..bd5073c 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="rect2246"
-         d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1614"
+         transform="translate(5,10)">
+        <path
+           id="rect2266"
+           d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2275"
+           d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2285"
-         d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 1869ca4..ebcd713 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * maximize_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * maximize_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 674bc2f..98715d9 100644
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
index c7ae783..3e890fd 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -10,204 +10,206 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata37" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs35" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview33" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         id="rect2318"
-         d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="rect2331"
-         d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2371"
-         d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 1627b26..b5c219c 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 062297b..6d5484d 100644
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
index ce55c3b..9c5185c 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -10,200 +10,173 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs28" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview26" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       style="display:inline"
-       id="g1639"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="rect2331"
-         d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1639"
+         transform="translate(3,9)">
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2371"
-         d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 4394a28..58b29bd 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index e6c0a90..ae53eae 100644
Binary files a/themes/default/maximize-toggled-prelight.png and b/themes/default/maximize-toggled-prelight.png differ
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
index 7219bcb..7584df0 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -10,218 +10,224 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs38" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview36" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="rect2318"
-         d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="rect2331"
-         d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,9)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2371"
-         d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index 1627b26..b5c219c 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index e0e1869..1162765 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg
index 69a21f5..c48cbd4 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -10,218 +10,224 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="maximize-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs38" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview36" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="rect2318"
-         d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="rect2331"
-         d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1626"
+         transform="translate(5,10)">
+        <path
+           id="rect2318"
+           d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           id="rect2331"
+           d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="rect2371"
+           d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="rect2371"
-         d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 1627b26..5c5e581 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * maximize_toggled_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 6fcad83..f23aadf 100644
Binary files a/themes/default/menu-active.png and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
index 17037af..7a26606 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -10,182 +10,155 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="menu-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 7c13c2b..e548be4 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,28 +1,34 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"16 22 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index b41f1a8..f23aadf 100644
Binary files a/themes/default/menu-inactive.png and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
index 5770e16..c5356aa 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -10,182 +10,155 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="menu-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 929ff4a..2f713b9 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,28 +1,34 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"16 22 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index 6fcad83..f23aadf 100644
Binary files a/themes/default/menu-prelight.png and b/themes/default/menu-prelight.png differ
diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg
index 52e454c..c4ed469 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -10,182 +10,155 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="menu-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
index 7c13c2b..e548be4 100644
--- a/themes/default/menu-prelight.xpm
+++ b/themes/default/menu-prelight.xpm
@@ -1,28 +1,34 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"16 22 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index 6fcad83..f23aadf 100644
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
index af601b4..9a7d0ff 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -10,182 +10,155 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="menu-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 7c13c2b..09910bf 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,28 +1,34 @@
 /* XPM */
-static char * menu_active_xpm[] = {
-"16 22 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+static char * menu_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index cd764b6..d34135b 100644
Binary files a/themes/default/right-active.png and b/themes/default/right-active.png differ
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
index 8e19f57..8e1fe36 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -9,58 +9,95 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1"
+   width="3"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,0 L 0.5,24"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 2.5,0 L 2.5,24"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index edb5260..aa8249b 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"1 24 3 1",
-"   c None",
-"#  c #C0C0C0 s active_color_2",
-"@  c #C0C0FF s active_color_1",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@"};
+"3 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index cd764b6..d34135b 100644
Binary files a/themes/default/right-inactive.png and b/themes/default/right-inactive.png differ
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
index d6630db..a04171d 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -9,58 +9,95 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1"
+   width="3"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata14" />
   <defs
-     id="defs7" />
+     id="defs12" />
   <sodipodi:namedview
-     id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview10" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="border">
-    <path
-       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,0 L 0.5,24"
-       id="path1340" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4" />
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0" />
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Border</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+          <cc:license
+             rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        </cc:Work>
+        <cc:License
+           rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Reproduction" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/Distribution" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/Notice" />
+          <cc:permits
+             rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/ShareAlike" />
+          <cc:requires
+             rdf:resource="http://web.resource.org/cc/SourceCode" />
+        </cc:License>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:label="Layer 1"
+       inkscape:groupmode="layer"
+       id="layer1">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 2.5,0 L 2.5,24"
+         id="path1340" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 7580bed..52286a4 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"1 24 3 1",
-"   c None",
-"#  c #C0C0C0 s inactive_color_2",
-"@  c #C0C0FF s inactive_color_1",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@",
-"@"};
+"3 24 3 1",
+"       c None",
+"#      c #C0C0C0 s inactive_color_2",
+"@      c #C0C0FF s inactive_color_2",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@",
+"@@@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index d9500cd..8d314d1 100644
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
index 103d3a7..9ee1c44 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -10,200 +10,202 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs34" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview32" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 053b6e2..0831e74 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 81f7aaf..b917708 100644
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
index decb849..977c31b 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -10,196 +10,169 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs27" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview25" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2420"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 39f913e..6a1ca81 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index 27df65f..b14785f 100644
Binary files a/themes/default/shade-prelight.png and b/themes/default/shade-prelight.png differ
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
index ab33114..fbf13a1 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,9)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index 053b6e2..0831e74 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index 941dcfc..a9e1aa4 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg
index debe7a3..fb52bce 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1616"
+         transform="translate(5,10)">
+        <path
+           d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 053b6e2..7f129b0 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * shade_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * shade_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index c783435..f31b9fc 100644
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
index b3ff6e0..66ca84f 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -10,200 +10,202 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs34" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview32" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 2f5bc42..e630557 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index d4af7b9..f2a6a6f 100644
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
index cf12483..2894cd5 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -10,196 +10,169 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs27" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview25" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(3,9)">
+        <path
+           id="path2620"
+           style="opacity:0.50;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2420"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index d0804eb..69c0403 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index 39301a0..dad76c2 100644
Binary files a/themes/default/shade-toggled-prelight.png and b/themes/default/shade-toggled-prelight.png differ
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
index 2f7471d..25264c8 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,9)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index 2f5bc42..e630557 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index 9846f0d..7421e11 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
index 68d9f23..8b42b1b 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="shade-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1624"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2405" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1628"
+         transform="translate(5,10)">
+        <path
+           d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+           style="opacity:0.33;fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2605" />
+        <path
+           d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+           style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+           id="path2620" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2420" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 2f5bc42..e5df2c8 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * shade_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * shade_toggled_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index 783eb72..d337eb5 100644
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
index 3157b11..572f073 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -10,200 +10,202 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata36" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs34" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview32" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
     <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 0a43043..da71c6e 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 8044305..ab286bf 100644
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
index 7bdf310..94f1090 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -10,196 +10,169 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata29" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs27" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview25" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 99f9fc1..1d7fa52 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index 2fa164d..d824cd1 100644
Binary files a/themes/default/stick-prelight.png and b/themes/default/stick-prelight.png differ
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
index 732a590..1eb8e94 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,6)">
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index 0a43043..da71c6e 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index c8cb5b8..2d7be54 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
index c6d5677..2d3ff1d 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -10,214 +10,220 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata39" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs37" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview35" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1613"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 0a43043..bac54bf 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * stick_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * stick_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 813a724..ba35fab 100644
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
index 8eef8ae..29b5892 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -10,205 +10,211 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata37" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs35" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview33" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         id="path2282"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 8edb6d8..e228f42 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index 05e7944..a3f4510 100644
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
index ddf55d0..c20db87 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -10,210 +10,178 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata30" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs28" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path29" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g22"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path24" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview26" />
   <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 22,0.5 C 22,0.5 22,28 22,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g20"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(3,9)">
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="6"
+           sodipodi:cx="6"
+           id="path2202"
+           style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         id="path2202"
-         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 21.5,28.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 9884195..06e3c3a 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index 8b4ab12..f3c6fa1 100644
Binary files a/themes/default/stick-toggled-prelight.png and b/themes/default/stick-toggled-prelight.png differ
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
index d83ad3b..6c45d0e 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -10,219 +10,229 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs38" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview36" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="prelight">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.95;fill-opacity:0.75;opacity:1.00"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,6)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,9)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         id="path2282"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index 8edb6d8..e228f42 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 28eeb91..ba56c1a 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
index bb783a4..a83a6a7 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -10,219 +10,229 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="22"
+   width="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="stick-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata40" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs38" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+     inkscape:window-height="480"
+     id="namedview36" />
   <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g24"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="frame">
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
     <g
-       style="display:inline"
-       id="g1969"
-       transform="translate(0,4)">
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
       <path
-         style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
-         id="path4123" />
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,26 22,26 L 0,26 L 0,1 z "
+         id="path6057" />
     </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="18"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="18"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 18,1.5"
-       id="path32" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
     <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,7)">
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
       <path
-         id="path1412"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 22,1 C 22,1 22,4 22,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="22"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="g31"
+       style="display:inline">
       <path
-         id="path2247"
-         d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 21.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer1"
+       inkscape:label="pressed">
+      <g
+         id="g1789"
+         transform="translate(0,0)">
+        <rect
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
+           x="1"
+           y="4"
+           rx="2"
+           ry="2"
+           width="20"
+           height="21"
+           id="path4123" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="g3722"
+       inkscape:label="Button">
+      <g
+         style="display:inline"
+         id="g1625"
+         transform="translate(5,10)">
+        <path
+           id="path1412"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path2287"
+           d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
+           sodipodi:ry="1"
+           sodipodi:rx="1"
+           sodipodi:cy="0"
+           sodipodi:cx="6"
+           id="path2292"
+           style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
       <path
-         id="path2282"
-         d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 21.5,26.5"
+         id="path6989" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 8edb6d8..a470d7e 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,27 +1,34 @@
 /* XPM */
-static char * stick_toggled_active_xpm[] = {
-"18 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-" @@@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@",
-" @@@@@@@@@@@@@@@@ ",
-"                  ",
-"                  "};
+static char * stick_toggled_pressed_xpm[] = {
+"22 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
diff --git a/themes/default/themerc b/themes/default/themerc
index 800f0b0..061359f 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,15 +1,14 @@
-active_text_color=#ffffff
-button_offset=5
+active_text_color=#0c0c0f
+active_text_shadow_color=#fcfcff
+inactive_text_color=#6c6c70
+inactive_text_shadow_color=#fcfcff
+button_offset=2
 button_spacing=0
-full_width_title=false
+full_width_title=true
 maximized_offset=0
-shadow_delta_height=4
-shadow_delta_width=1
-shadow_delta_x=1
-shadow_delta_y=1
 show_app_icon=true
-title_horizontal_offset=4
-title_shadow_active=frame
-title_shadow_inactive=false
-title_vertical_offset_active=2
-title_vertical_offset_inactive=2
+title_horizontal_offset=1
+title_shadow_active=under
+title_shadow_inactive=under
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index 304283f..981b149 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.svg b/themes/default/title-1-active.svg
index 4b03056..40fa259 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-1-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index aa27dea..de1ca89 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index 1923582..981b149 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.svg b/themes/default/title-1-inactive.svg
index 0ecf098..6fb724b 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-1-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index e1991bc..dd1cbdc 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 304283f..981b149 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.svg b/themes/default/title-2-active.svg
index f4ceeb7..48c3d65 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-2-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index aa27dea..de1ca89 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 1923582..981b149 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.svg b/themes/default/title-2-inactive.svg
index 244dec1..8db3967 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-2-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index e1991bc..dd1cbdc 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 304283f..981b149 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.svg b/themes/default/title-3-active.svg
index 57017aa..caad8ec 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-3-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer2"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index aa27dea..de1ca89 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 1923582..981b149 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.svg b/themes/default/title-3-inactive.svg
index ea55fb1..fad4dcb 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-3-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index e1991bc..dd1cbdc 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 304283f..eabcc4a 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.svg b/themes/default/title-4-active.svg
index 5cdece4..c6a6333 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -11,181 +11,183 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-4-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs30" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview28" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 0,19 C 0,19 0,26 8,26 L 8,1 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M -0.5,1 L 0.5,19.5 C 0.5,19.5 0.5,26.5 7.5,26.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index aa27dea..de1ca89 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 1923582..981b149 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.svg b/themes/default/title-4-inactive.svg
index fbfb678..1b92807 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-4-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index e1991bc..dd1cbdc 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 304283f..c6d0280 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.svg b/themes/default/title-5-active.svg
index 0d27d0b..35259f2 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -11,181 +11,183 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-5-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs30" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview28" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,26 8,26 L 0,26 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 7.5,26.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index aa27dea..de1ca89 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index 1923582..981b149 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.svg b/themes/default/title-5-inactive.svg
index b1262f0..dd103de 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -11,181 +11,154 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="title-5-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="400"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Title</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,0.5 L 7.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6057"
-       width="8"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3141"
-       width="8"
-       height="13"
-       x="0"
-       y="12" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="M 0,1.5 L 8,1.5"
-       id="path29" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="400"
+       inkscape:window-x="0"
+       inkscape:window-y="0"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Title</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,0.5 L 8,0.5 C 8,0.5 8,28 8,28 L 0,28 L 0,0.5 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+         d="M 0.5,0.5 L 7.5,0.5"
+         id="path6059" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index e1991bc..dd1cbdc 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"4 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"...."};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 9bf1a39..35f6522 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.svg b/themes/default/top-left-active.svg
index 8947216..d387eea 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -12,174 +12,150 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="top-left-active.svg"
    version="1.0"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:version="0.32"
    id="svg2"
-   height="22"
    width="8"
+   height="29"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="733"
-     inkscape:window-x="187"
-     inkscape:window-y="724"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Border">
-    <path
-       id="rect1319"
-       d="M 8,0 8,1 5,1 C 5,1 1,2 1,7 1,23 1,22 1,22 L 0,22 0,0 z"
-       style="fill:#a0a0a0;fill-opacity:0.25" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Grad"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <path
-       id="path6057"
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-      d="M 8,1 7,1 C 6,1 1,1 1,7 c 0,3 0,5 0,15 l 7,0 0,0 z" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 6,1 C 6,1 3,1 3,5 l 1,0 4,0 0,0 z"
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2,12 6,0 0,10 -6,0 z"
-       id="path2396" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="m 8,1.5 -3,0 c 0,0 -3.5,0 -3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
-       id="path2170" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index c5cc6c4..a0d9e09 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"    @@@@",
-"  @@@@@@",
-" @@@@@@@",
-" @@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+"8 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"    ....",
+"  ......",
+" .......",
+" .......",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 361d422..35f6522 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.svg b/themes/default/top-left-inactive.svg
index aa64aea..4e8dd85 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -12,174 +12,150 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="top-left-inactive.svg"
    version="1.0"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:version="0.32"
    id="svg2"
-   height="22"
    width="8"
+   height="29"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="733"
-     inkscape:window-x="187"
-     inkscape:window-y="724"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Border">
-    <path
-       id="rect1319"
-       d="M 8,0 8,1 5,1 C 5,1 1,2 1,7 1,23 1,22 1,22 L 0,22 0,0 z"
-       style="fill:#a0a0a0;fill-opacity:0.25" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Grad"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <path
-       id="path6057"
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,1 7,1 C 6,1 1,1 1,7 c 0,3 0,5 0,15 l 7,0 0,0 z" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 6,1 C 6,1 3,1 3,5 l 1,0 4,0 0,0 z"
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 2,12 6,0 0,10 -6,0 z"
-       id="path2396" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="m 8,1.5 -3,0 c 0,0 -3.5,0 -3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
-       id="path2170" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       style="display:inline"
+       inkscape:label="Grad"
+       id="layer2"
+       inkscape:groupmode="layer">
+      <path
+         id="path6057"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+    </g>
+    <g
+       inkscape:label="hilight"
+       id="layer3"
+       inkscape:groupmode="layer">
+      <path
+         id="path6061"
+         d="M 8,1 L 6.75,1 C 6.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 8,1 L 5,1 C 5,1 1.5,1.5 1,6 L 1,14 C 1,14 1,19 6,19 L 8,19 L 8,19 L 8,1 z "
+         id="path1884" />
+    </g>
+    <g
+       style="display:inline"
+       id="layer1"
+       inkscape:groupmode="layer"
+       inkscape:label="Border">
+      <path
+         id="rect1319"
+         d="M 8,0 L 8,1 L 5,1 C 5,1 1.5,1.5 1,6 C 1,29 1,29 1,29 L 0,29 L 0,0 L 8,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:label="Shadow"
+       id="layer5"
+       inkscape:groupmode="layer">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 2.5,28.5 L 7.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 57b823f..741b2cb 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"    @@@@",
-"  @@@@@@",
-" @@@@@@@",
-" @@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+"8 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"    ....",
+"  ......",
+" .......",
+" .......",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 2e01e31..e9904d4 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.svg b/themes/default/top-right-active.svg
index 43ac40c..4b7f851 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -11,175 +11,183 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="top-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata32" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs30" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="733"
-     inkscape:window-x="187"
-     inkscape:window-y="724"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       id="rect1319"
-       d="M 0,0 0,1 3,1 C 3,1 7,2 7,7 7,23 7,22 7,22 L 8,22 8,0 z"
-       style="fill:#a0a0a0;fill-opacity:0.25" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 0,1 1,0 c 1,0 6,0 6,6 0,3 0,5 0,15 l -7,0 0,0 z"
-       id="path6057" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview28" />
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 2,1 C 2,1 5,1 5,5 L 4,5 0,5 0,5 z"
-       id="path6061" />
-    <path
-       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 6,12 -6,0 0,10 6,0 z"
-       id="path2396" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="m 0,1.5 3,0 c 0,0 3.5,0 3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
-       id="path2170" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         id="linearGradient5847">
+        <stop
+           id="stop5849"
+           offset="0"
+           style="stop-color:black;stop-opacity:0.30;" />
+        <stop
+           id="stop2776"
+           offset="0.4"
+           style="stop-color:black;stop-opacity:0.20;" />
+        <stop
+           id="stop2779"
+           offset="0.6"
+           style="stop-color:black;stop-opacity:0.25;" />
+        <stop
+           id="stop5851"
+           offset="1"
+           style="stop-color:black;stop-opacity:0.10;" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient5847"
+         id="linearGradient6945"
+         gradientUnits="userSpaceOnUse"
+         x1="0"
+         y1="0.5"
+         x2="0"
+         y2="28.5"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,26 L 0,26 L 0,26 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 1.25,1 C 1.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
+         id="path6061" />
+      <rect
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1884"
+         width="8"
+         height="18"
+         x="0"
+         y="1" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+         d="M 0.5,26.5 L 6.5,26.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index ca7e04b..1cb0608 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 22 2 1",
-"   c None",
-"@  c #C0C0FF s active_color_1",
-"@@@@    ",
-"@@@@@@  ",
-"@@@@@@@ ",
-"@@@@@@@ ",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+"8 29 2 1",
+"       c None",
+".      c #C0C0FF s active_color_2",
+"....    ",
+"......  ",
+"....... ",
+"....... ",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index 86de64f..25f92a5 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.svg b/themes/default/top-right-inactive.svg
index 7ae2732..fd39f28 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -11,175 +11,151 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="22"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
    sodipodi:docname="top-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata26" />
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3143">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0;"
-         offset="0"
-         id="stop3145" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.00;"
-         offset="1"
-         id="stop3147" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.75;" />
-      <stop
-         id="stop5851"
-         offset="0.75"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop14"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient3148"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="none" />
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3143"
-       id="linearGradient3149"
-       x1="0"
-       y1="13"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs24" />
   <sodipodi:namedview
-     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="0"
-     inkscape:cy="0"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     gridtolerance="0.5px"
-     guidetolerance="1px"
      inkscape:window-width="640"
-     inkscape:window-height="733"
-     inkscape:window-x="187"
-     inkscape:window-y="724"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="false"
-     showguides="true">
-    <inkscape:grid
-       id="GridFromPre046Settings"
-       type="xygrid"
-       originx="0px"
-       originy="0px"
-       spacingx="0px"
-       spacingy="1px"
-       color="#0000ff"
-       empcolor="#0000ff"
-       opacity="0.2"
-       empopacity="0.4"
-       empspacing="5" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Top Corner</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Olivier Fourdan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       id="rect1319"
-       d="M 0,0 0,1 3,1 C 3,1 7,2 7,7 7,23 7,22 7,22 L 8,22 8,0 z"
-       style="fill:#a0a0a0;fill-opacity:0.25" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient3148);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 0,1 1,0 c 1,0 6,0 6,6 0,3 0,5 0,15 l -7,0 0,0 z"
-       id="path6057" />
-  </g>
+     inkscape:window-height="480"
+     id="namedview22" />
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 2,1 C 2,1 5,1 5,5 L 4,5 0,5 0,5 z"
-       id="path6061" />
-    <path
-       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 6,12 -6,0 0,10 5,0 z"
-       id="path2396" />
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
-       d="m 0,1.5 3,0 c 0,0 3.5,0 3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
-       id="path2170" />
+     transform="scale(1)"
+     id="g3">
+    <defs
+       id="defs4">
+      <linearGradient
+         id="linearGradient1886">
+        <stop
+           style="stop-color:white;stop-opacity:1;"
+           offset="0"
+           id="stop1888" />
+        <stop
+           style="stop-color:white;stop-opacity:0.15;"
+           offset="1"
+           id="stop1890" />
+      </linearGradient>
+      <linearGradient
+         inkscape:collect="always"
+         xlink:href="#linearGradient1886"
+         id="linearGradient1892"
+         x1="0"
+         y1="1"
+         x2="0"
+         y2="18"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(1,0,0,1,0,0)" />
+    </defs>
+    <sodipodi:namedview
+       id="base"
+       pagecolor="white"
+       bordercolor="#666666"
+       borderopacity="1.0"
+       inkscape:pageopacity="0.0"
+       inkscape:pageshadow="2"
+       inkscape:zoom="10"
+       inkscape:cx="0"
+       inkscape:cy="0"
+       inkscape:document-units="px"
+       inkscape:current-layer="layer1"
+       showgrid="true"
+       inkscape:grid-bbox="true"
+       inkscape:grid-points="true"
+       gridtolerance="0.5px"
+       guidetolerance="1px"
+       inkscape:window-width="640"
+       inkscape:window-height="733"
+       inkscape:window-x="187"
+       inkscape:window-y="728"
+       inkscape:guide-bbox="true"
+       inkscape:guide-points="false"
+       showguides="true">
+      <inkscape:grid
+         id="GridFromPre046Settings"
+         type="xygrid"
+         originx="0px"
+         originy="0px"
+         spacingx="1px"
+         spacingy="1px"
+         color="#3f3fff"
+         empcolor="#3f3fff"
+         opacity="0.15"
+         empopacity="0.38"
+         empspacing="5" />
+    </sodipodi:namedview>
+    <metadata
+       id="metadata7">
+      <rdf:RDF>
+        <cc:Work
+           rdf:about="">
+          <dc:format>image/svg+xml</dc:format>
+          <dc:type
+             rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+          <dc:title>Top Corner</dc:title>
+          <dc:creator>
+            <cc:Agent>
+              <dc:title>Olivier Fourdan</dc:title>
+            </cc:Agent>
+          </dc:creator>
+        </cc:Work>
+      </rdf:RDF>
+    </metadata>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="Grad"
+       style="display:inline">
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 2,1 C 2,1 6.5,1.5 7,6 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+         id="path6057" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="hilight">
+      <path
+         style="fill:none;fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+         id="path6061" />
+      <path
+         style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,10 C 7,10 7,17 2,17 L 0,17 L 0,17 L 0,1 z "
+         id="path1884" />
+    </g>
+    <g
+       inkscape:label="Border"
+       inkscape:groupmode="layer"
+       id="layer1"
+       style="display:inline">
+      <path
+         id="rect1319"
+         d="M 0,0 L 0,1 L 2,1 C 2,1 6.5,1.5 7,6 C 7,29 7,29 7,29 L 8,29 L 8,0 L 0,0 z "
+         style="fill:black;fill-opacity:0.50" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="Shadow">
+      <path
+         style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+         d="M 0.5,28.5 L 5.5,28.5"
+         id="path6989" />
+    </g>
   </g>
 </svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 3547723..d2cdb29 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,27 +1,34 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@    ",
-"@@@@@@  ",
-"@@@@@@@ ",
-"@@@@@@@ ",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+"8 29 2 1",
+"       c None",
+".      c #C0C0FF s inactive_color_2",
+"....    ",
+"......  ",
+"....... ",
+"....... ",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........"};
diff --git a/themes/kokodi/Makefile.am b/themes/kokodi/Makefile.am
index 808cbd2..56c95ad 100644
--- a/themes/kokodi/Makefile.am
+++ b/themes/kokodi/Makefile.am
@@ -207,5 +207,5 @@ vacuum-defs:
 update-png:
 	for svg_file in $(SVG_FILES); do \
 		image=$${svg_file%.svg}; \
-		rsvg -f png $$svg_file $$image.png; \
+		rsvg-convert -f png $$svg_file > $$image.png; \
 	done

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list