diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index d506222..1e8b9dd 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -305,6 +305,25 @@
                                               </packing>
                                             </child>
                                             <child>
+                                              <object class="GtkButton" id="button-layout-A">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="tooltip_text" translatable="yes">Above</property>
+                                                <child>
+                                                  <object class="GtkImage" id="image7">
+                                                    <property name="visible">True</property>
+                                                    <property name="icon_name">xfce-wm-above</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">3</property>
+                                              </packing>
+                                            </child>
+                                            <child>
                                               <object class="GtkButton" id="button-layout-H">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
@@ -320,7 +339,7 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="position">3</property>
+                                                <property name="position">4</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -339,7 +358,7 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="position">4</property>
+                                                <property name="position">5</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -358,7 +377,7 @@
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
-                                                <property name="position">5</property>
+                                                <property name="position">6</property>
                                               </packing>
                                             </child>
                                           </object>
diff --git a/src/client.c b/src/client.c
index 4e86808..a45e404 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3795,6 +3795,9 @@ clientButtonPress (Client *c, Window w, XButtonEvent * bev)
             case STICK_BUTTON:
                 clientToggleSticky (c, TRUE);
                 break;
+            case ABOVE_BUTTON:
+                clientToggleLayerAbove (c);
+                break;
             default:
                 break;
         }
@@ -3842,6 +3845,14 @@ clientGetButtonPixmap (Client *c, int button, int state)
             }
             return &screen_info->buttons[MAXIMIZE_BUTTON][state];
             break;
+        case ABOVE_BUTTON:
+            if (FLAG_TEST (c->flags, CLIENT_FLAG_ABOVE)
+                && (!xfwmPixmapNone(&screen_info->buttons[ABOVE_BUTTON][state + STATE_TOGGLED])))
+            {
+                return &screen_info->buttons[ABOVE_BUTTON][state + STATE_TOGGLED];
+            }
+            return &screen_info->buttons[ABOVE_BUTTON][state];
+            break;
         default:
             break;
     }
diff --git a/src/display.h b/src/display.h
index 8797237..436a46c 100644
--- a/src/display.h
+++ b/src/display.h
@@ -124,6 +124,7 @@ enum
     HIDE_BUTTON,
     MAXIMIZE_BUTTON,
     CLOSE_BUTTON,
+    ABOVE_BUTTON,
     TITLE_SEPARATOR,
     BUTTON_STRING_COUNT
 };
diff --git a/src/events.c b/src/events.c
index 4b49171..df70c4e 100644
--- a/src/events.c
+++ b/src/events.c
@@ -73,7 +73,8 @@
                                  (win == MYWINDOW_XWINDOW(c->buttons[CLOSE_BUTTON])) || \
                                  (win == MYWINDOW_XWINDOW(c->buttons[MAXIMIZE_BUTTON])) || \
                                  (win == MYWINDOW_XWINDOW(c->buttons[SHADE_BUTTON])) || \
-                                 (win == MYWINDOW_XWINDOW(c->buttons[STICK_BUTTON])))
+                                 (win == MYWINDOW_XWINDOW(c->buttons[STICK_BUTTON])) || \
+                                 (win == MYWINDOW_XWINDOW(c->buttons[ABOVE_BUTTON])))
 
 #define DOUBLE_CLICK_GRAB       (ButtonMotionMask | \
                                  PointerMotionMask | \
@@ -376,6 +377,7 @@ handleKeyPress (DisplayInfo *display_info, XKeyEvent * ev)
                 break;
             case KEY_TOGGLE_ABOVE:
                 clientToggleLayerAbove (c);
+		frameQueueDraw (c, FALSE);
                 break;
             case KEY_TOGGLE_FULLSCREEN:
                 clientToggleFullscreen (c);
@@ -2426,9 +2428,11 @@ menu_callback (Menu * menu, MenuOp op, Window xid, gpointer menu_data, gpointer
                 break;
             case MENU_OP_ABOVE:
                 clientToggleLayerAbove (c);
+                frameQueueDraw (c, FALSE);
                 break;
             case MENU_OP_NORMAL:
                 clientSetLayerNormal (c);
+                frameQueueDraw (c, FALSE);
                 break;
             case MENU_OP_BELOW:
                 clientToggleLayerBelow (c);
diff --git a/src/frame.c b/src/frame.c
index 7f4cbd3..ec241f9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -530,6 +530,13 @@ getButtonFromLetter (char chr, Client * c)
                 b = MENU_BUTTON;
             }
             break;
+        case 'A':
+	    if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
+		!clientIsTransientOrModal (c))
+	    {
+	        b = ABOVE_BUTTON;
+	    }
+            break;
         case '|':
             b = TITLE_SEPARATOR;
             break;
@@ -582,6 +589,13 @@ getLetterFromButton (int i, Client * c)
                 chr = 'O';
             }
             break;
+        case ABOVE_BUTTON:
+	    if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
+		!clientIsTransientOrModal (c))
+	    {
+                chr = 'A';
+	    }
+            break;
         default:
             chr = 0;
     }
diff --git a/src/settings.c b/src/settings.c
index 607bb7b..c52b8b2 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -325,7 +325,8 @@ loadTheme (ScreenInfo *screen_info, Settings *rc)
         "shade",
         "hide",
         "maximize",
-        "close"
+        "close",
+        "above"
     };
 
     static const char *button_state_names[] = {
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index 3519467..aae1435 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,6 +1,14 @@
 themedir = $(datadir)/themes/Default/xfwm4
 
 PNG_FILES = 								\
+	above-active.png						\
+	above-inactive.png						\
+	above-prelight.png						\
+	above-pressed.png						\
+	above-toggled-active.png					\
+	above-toggled-inactive.png					\
+	above-toggled-prelight.png					\
+	above-toggled-pressed.png					\
 	bottom-active.png						\
 	bottom-inactive.png						\
 	bottom-left-active.png						\
@@ -63,6 +71,14 @@ PNG_FILES = 								\
 	top-right-inactive.png
 
 SVG_FILES = 								\
+	above-active.svg						\
+	above-inactive.svg						\
+	above-prelight.svg						\
+	above-pressed.svg						\
+	above-toggled-active.svg					\
+	above-toggled-inactive.svg					\
+	above-toggled-prelight.svg					\
+	above-toggled-pressed.svg					\
 	bottom-active.svg						\
 	bottom-inactive.svg						\
 	bottom-left-active.svg						\
@@ -125,6 +141,14 @@ SVG_FILES = 								\
 	top-right-inactive.svg
 
 XPM_FILES = 								\
+	above-active.xpm						\
+	above-inactive.xpm						\
+	above-prelight.xpm						\
+	above-pressed.xpm						\
+	above-toggled-active.xpm					\
+	above-toggled-inactive.xpm					\
+	above-toggled-prelight.xpm					\
+	above-toggled-pressed.xpm					\
 	bottom-active.xpm						\
 	bottom-inactive.xpm						\
 	bottom-left-active.xpm						\
@@ -207,5 +231,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/above-active.png b/themes/default/above-active.png
index e69de29..68473b4 100644
Binary files a/themes/default/above-active.png and b/themes/default/above-active.png differ
diff --git a/themes/default/above-active.svg b/themes/default/above-active.svg
index e69de29..48b155e 100644
--- a/themes/default/above-active.svg
+++ b/themes/default/above-active.svg
@@ -0,0 +1,214 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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>
+  <g
+     inkscape:groupmode="layer"
+     id="g20"
+     inkscape:label="Button">
+    <g
+       style="display:inline"
+       id="g1613">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect6662"
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.33" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:1"
+         id="rect6664"
+         width="6"
+         height="6"
+         x="6"
+         y="9" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-active.xpm b/themes/default/above-active.xpm
index e69de29..8fa8947 100644
--- a/themes/default/above-active.xpm
+++ b/themes/default/above-active.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-inactive.png b/themes/default/above-inactive.png
index e69de29..6845ba5 100644
Binary files a/themes/default/above-inactive.png and b/themes/default/above-inactive.png differ
diff --git a/themes/default/above-inactive.svg b/themes/default/above-inactive.svg
index e69de29..bf5dc08 100644
--- a/themes/default/above-inactive.svg
+++ b/themes/default/above-inactive.svg
@@ -0,0 +1,207 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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:groupmode="layer"
+     id="g20"
+     inkscape:label="Button">
+    <g
+       style="display:inline"
+       id="g1613">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect4590"
+         style="fill:none;stroke:#a0a0a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.50000000000000000" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-inactive.xpm b/themes/default/above-inactive.xpm
index e69de29..32c3294 100644
--- a/themes/default/above-inactive.xpm
+++ b/themes/default/above-inactive.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_inactive_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s inactive_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-prelight.png b/themes/default/above-prelight.png
index e69de29..d03cfc7 100644
Binary files a/themes/default/above-prelight.png and b/themes/default/above-prelight.png differ
diff --git a/themes/default/above-prelight.svg b/themes/default/above-prelight.svg
index e69de29..aac1254 100644
--- a/themes/default/above-prelight.svg
+++ b/themes/default/above-prelight.svg
@@ -0,0 +1,228 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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="layer4"
+     inkscape:label="frame">
+    <g
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <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" />
+    </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">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect6144"
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.33" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:1"
+         id="rect6146"
+         width="6"
+         height="6"
+         x="6"
+         y="9" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-prelight.xpm b/themes/default/above-prelight.xpm
index e69de29..8fa8947 100644
--- a/themes/default/above-prelight.xpm
+++ b/themes/default/above-prelight.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-pressed.png b/themes/default/above-pressed.png
index e69de29..808b510 100644
Binary files a/themes/default/above-pressed.png and b/themes/default/above-pressed.png differ
diff --git a/themes/default/above-pressed.svg b/themes/default/above-pressed.svg
index e69de29..9f8eba2 100644
--- a/themes/default/above-pressed.svg
+++ b/themes/default/above-pressed.svg
@@ -0,0 +1,228 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
+    <g
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <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" />
+    </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">
+      <rect
+         y="10"
+         x="6"
+         height="6"
+         width="6"
+         id="rect5626"
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.33" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:1"
+         id="rect5628"
+         width="6"
+         height="6"
+         x="6"
+         y="10" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-pressed.xpm b/themes/default/above-pressed.xpm
index e69de29..8fa8947 100644
--- a/themes/default/above-pressed.xpm
+++ b/themes/default/above-pressed.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-toggled-active.png b/themes/default/above-toggled-active.png
index e69de29..e3a455e 100644
Binary files a/themes/default/above-toggled-active.png and b/themes/default/above-toggled-active.png differ
diff --git a/themes/default/above-toggled-active.svg b/themes/default/above-toggled-active.svg
index e69de29..c41cc18 100644
--- a/themes/default/above-toggled-active.svg
+++ b/themes/default/above-toggled-active.svg
@@ -0,0 +1,221 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-toggled-active.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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>
+  <g
+     inkscape:groupmode="layer"
+     id="g20"
+     inkscape:label="Button">
+    <g
+       style="display:inline"
+       id="g1625">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect4598"
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.33" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:1"
+         id="rect5108"
+         width="6"
+         height="6"
+         x="6"
+         y="9" />
+      <rect
+         y="11"
+         x="8"
+         height="2"
+         width="2"
+         id="rect5057"
+         style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-toggled-active.xpm b/themes/default/above-toggled-active.xpm
index e69de29..04434cd 100644
--- a/themes/default/above-toggled-active.xpm
+++ b/themes/default/above-toggled-active.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_toggled_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-toggled-inactive.png b/themes/default/above-toggled-inactive.png
index e69de29..290b584 100644
Binary files a/themes/default/above-toggled-inactive.png and b/themes/default/above-toggled-inactive.png differ
diff --git a/themes/default/above-toggled-inactive.svg b/themes/default/above-toggled-inactive.svg
index e69de29..fb13641 100644
--- a/themes/default/above-toggled-inactive.svg
+++ b/themes/default/above-toggled-inactive.svg
@@ -0,0 +1,224 @@
+<?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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-toggled-inactive.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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>
+  <g
+     inkscape:groupmode="layer"
+     id="g20"
+     inkscape:label="Button">
+    <g
+       style="display:inline"
+       id="g1625">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect5055"
+         style="fill:none;stroke:#a0a0a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.5" />
+      <rect
+         y="11"
+         x="8"
+         height="2"
+         width="2"
+         id="rect5057"
+         style="opacity:0.5;fill:#a0a0a0;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-toggled-inactive.xpm b/themes/default/above-toggled-inactive.xpm
index e69de29..9c94d64 100644
--- a/themes/default/above-toggled-inactive.xpm
+++ b/themes/default/above-toggled-inactive.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_toggled_inactive_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s inactive_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-toggled-prelight.png b/themes/default/above-toggled-prelight.png
index e69de29..eea38a7 100644
Binary files a/themes/default/above-toggled-prelight.png and b/themes/default/above-toggled-prelight.png differ
diff --git a/themes/default/above-toggled-prelight.svg b/themes/default/above-toggled-prelight.svg
index e69de29..6ddfd9c 100644
--- a/themes/default/above-toggled-prelight.svg
+++ b/themes/default/above-toggled-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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-toggled-prelight.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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="layer4"
+     inkscape:label="frame">
+    <g
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <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" />
+    </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">
+      <rect
+         y="9"
+         x="6"
+         height="6"
+         width="6"
+         id="rect4024"
+         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.33" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:1"
+         id="rect4537"
+         width="6"
+         height="6"
+         x="6"
+         y="9" />
+      <rect
+         y="11"
+         x="8"
+         height="2"
+         width="2"
+         id="rect5057"
+         style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-toggled-prelight.xpm b/themes/default/above-toggled-prelight.xpm
index e69de29..04434cd 100644
--- a/themes/default/above-toggled-prelight.xpm
+++ b/themes/default/above-toggled-prelight.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_toggled_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};
diff --git a/themes/default/above-toggled-pressed.png b/themes/default/above-toggled-pressed.png
index e69de29..2ea6fb4 100644
Binary files a/themes/default/above-toggled-pressed.png and b/themes/default/above-toggled-pressed.png differ
diff --git a/themes/default/above-toggled-pressed.svg b/themes/default/above-toggled-pressed.svg
index e69de29..b8e393b 100644
--- a/themes/default/above-toggled-pressed.svg
+++ b/themes/default/above-toggled-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="18"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="above-toggled-pressed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     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="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>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
+    <g
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <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" />
+    </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">
+      <rect
+         y="10"
+         x="6"
+         height="6"
+         width="6"
+         id="rect3249"
+         style="opacity:0.33;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         style="opacity:1;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect4022"
+         width="6"
+         height="6"
+         x="6"
+         y="10" />
+      <rect
+         y="12"
+         x="8"
+         height="2"
+         width="2"
+         id="rect5057"
+         style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/default/above-toggled-pressed.xpm b/themes/default/above-toggled-pressed.xpm
index e69de29..04434cd 100644
--- a/themes/default/above-toggled-pressed.xpm
+++ b/themes/default/above-toggled-pressed.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * above_toggled_active_xpm[] = {
+"18 22 2 1",
+"   c None",
+"@  c #C0C0FF s active_color_1",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" @@@@@@@@@@@@@@@@ ",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@",
+" @@@@@@@@@@@@@@@@ ",
+"                  ",
+"                  "};