Update theme

(Old svn revision: 25913)

167 files changed, 647 insertions, 427 deletions

diff --git a/themes/default/README b/themes/default/README
index d01786097..82cc1f56d 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,4 +1,4 @@
-SVG based theme for xfwm4.
+joy - SVG based theme for xfwm4.
 Created Sept. 2006 by Olivier Fourdan <fourdan@xfce.org>
 Modified Oct. 2006 by Olivier Fourdan <fourdan@xfce.org>
 Modified Jul. 2007 by Olivier Fourdan <fourdan@xfce.org>
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 8eb40a1d2..65f51be98 100644
--- a/themes/default/bottom-active.png
+++ b/themes/default/bottom-active.png
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
index 891f7c910..1b8238982 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index 8eb40a1d2..65f51be98 100644
--- a/themes/default/bottom-inactive.png
+++ b/themes/default/bottom-inactive.png
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
index 5467dba7d..f967d2cff 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 308f43843..9f90c67a4 100644
--- a/themes/default/bottom-left-active.png
+++ b/themes/default/bottom-left-active.png
diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg
index 4e62fadbc..65f2d6fdc 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 308f43843..9f90c67a4 100644
--- a/themes/default/bottom-left-inactive.png
+++ b/themes/default/bottom-left-inactive.png
diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg
index ff2fae9d0..5c441bf99 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index 4c90a55b8..2d1c0bb3e 100644
--- a/themes/default/bottom-right-active.png
+++ b/themes/default/bottom-right-active.png
diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg
index 6fd91673e..5776ce0c2 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index 4c90a55b8..2d1c0bb3e 100644
--- a/themes/default/bottom-right-inactive.png
+++ b/themes/default/bottom-right-inactive.png
diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg
index f81aa974e..d212110e4 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="bottom-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 4d118f6c2..8f74e4c87 100644
--- a/themes/default/close-active.png
+++ b/themes/default/close-active.png
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
index b25c43c4a..abc9ed1c5 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="close-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -223,7 +236,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 98936c509..972a19947 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * close_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index 5fa496a95..3bf451f1e 100644
--- a/themes/default/close-inactive.png
+++ b/themes/default/close-inactive.png
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
index ed5dfa509..83ec4e78a 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="close-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -201,7 +201,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 5f56fba84..abecaf3a6 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * close_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index fc915c87a..2a79ed751 100644
--- a/themes/default/close-prelight.png
+++ b/themes/default/close-prelight.png
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
index de2711015..ff28cf245 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="close-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -250,7 +263,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index c57839b10..d2719ed55 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * close_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index a394a6b85..618763a20 100644
--- a/themes/default/close-pressed.png
+++ b/themes/default/close-pressed.png
diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg
index 468138390..605da0360 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="close-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -250,7 +263,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index c57839b10..d2719ed55 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * close_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index 53d7bd70b..7d98a78fc 100644
--- a/themes/default/hide-active.png
+++ b/themes/default/hide-active.png
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
index 249e32d13..862e36498 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="hide-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -217,7 +230,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 9b6f8993c..fc4dd1a97 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * hide_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index dbceb93af..5440da81e 100644
--- a/themes/default/hide-inactive.png
+++ b/themes/default/hide-inactive.png
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
index ae251000a..7681cf0b3 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="hide-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -201,7 +201,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 41331730f..e50c1accc 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * hide_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index 62e5db884..3372e84ec 100644
--- a/themes/default/hide-prelight.png
+++ b/themes/default/hide-prelight.png
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
index c80df8cfa..7f91f1635 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="hide-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -244,7 +257,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index b49e6ee85..b1099fd6e 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * hide_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index c77a5240e..2b29bb0ab 100644
--- a/themes/default/hide-pressed.png
+++ b/themes/default/hide-pressed.png
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
index c907e56f2..6a7e14124 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="hide-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -244,7 +257,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index b49e6ee85..b1099fd6e 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * hide_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index ab4de17c2..44fed2421 100644
--- a/themes/default/left-active.png
+++ b/themes/default/left-active.png
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
index 9b199fd03..29e54a607 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index ab4de17c2..44fed2421 100644
--- a/themes/default/left-inactive.png
+++ b/themes/default/left-inactive.png
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
index 9bf1503a5..911894dac 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index b7a9ebf90..5413701dc 100644
--- a/themes/default/maximize-active.png
+++ b/themes/default/maximize-active.png
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
index 66dc5e9a7..f27ba5c3a 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -211,7 +224,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index c37ffcfd3..44ef26473 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 227617b06..cc471b924 100644
--- a/themes/default/maximize-inactive.png
+++ b/themes/default/maximize-inactive.png
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
index 25f8d847b..9a5c95938 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -198,7 +198,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index bac4813be..eb44510fd 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index e92e187dd..8cab55969 100644
--- a/themes/default/maximize-prelight.png
+++ b/themes/default/maximize-prelight.png
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
index 5ca019792..6d548596c 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index 60f4a88d0..02f29a9bf 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index 44e9a4cda..461c3e36a 100644
--- a/themes/default/maximize-pressed.png
+++ b/themes/default/maximize-pressed.png
diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg
index cbf0a6814..23d1cc2fd 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 60f4a88d0..02f29a9bf 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index e3db4f6a1..ed5f7ca9a 100644
--- a/themes/default/maximize-toggled-active.png
+++ b/themes/default/maximize-toggled-active.png
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
index 4e2c823cc..ea9037ceb 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -215,7 +228,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 4065de3c8..f21c95518 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_toggled_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 5221e73db..81510f5d8 100644
--- a/themes/default/maximize-toggled-inactive.png
+++ b/themes/default/maximize-toggled-inactive.png
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
index 96d2e3c8d..6be4abfa6 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -202,7 +202,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 70da67796..023bf7a16 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_toggled_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index d39a110e9..ffd06ff6d 100644
--- a/themes/default/maximize-toggled-prelight.png
+++ b/themes/default/maximize-toggled-prelight.png
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
index 9c4fc27d3..5b0082fe8 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -242,7 +255,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index f618ab88e..ed9253625 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 9e60be9de..82f4a9a42 100644
--- a/themes/default/maximize-toggled-pressed.png
+++ b/themes/default/maximize-toggled-pressed.png
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg
index 4d418e4d2..beee61069 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="maximize-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -242,7 +255,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index f618ab88e..ed9253625 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * maximize_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 86c273a68..7f97cc02e 100644
--- a/themes/default/menu-active.png
+++ b/themes/default/menu-active.png
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
index bed66dac8..548632994 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="menu-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -142,17 +142,17 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      inkscape:label="hilight">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
@@ -170,7 +170,7 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      style="display:inline">
     <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.50"
@@ -180,11 +180,11 @@
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index 86c273a68..7f97cc02e 100644
--- a/themes/default/menu-inactive.png
+++ b/themes/default/menu-inactive.png
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
index 1230a8dc8..be642b84d 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="menu-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -142,17 +142,17 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      inkscape:label="hilight">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
@@ -170,7 +170,7 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      style="display:inline">
     <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.50"
@@ -180,11 +180,11 @@
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index 86c273a68..cef6a62af 100644
--- a/themes/default/menu-prelight.png
+++ b/themes/default/menu-prelight.png
diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg
index f5635e818..6c2c31e63 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="menu-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -142,17 +142,17 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      inkscape:label="hilight">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
@@ -170,7 +170,7 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      style="display:inline">
     <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.50"
@@ -180,11 +180,11 @@
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index 86c273a68..cef6a62af 100644
--- a/themes/default/menu-pressed.png
+++ b/themes/default/menu-pressed.png
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
index e3b1159cc..0ddec35e9 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="menu-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -142,17 +142,17 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      inkscape:label="hilight">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
@@ -170,7 +170,7 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      style="display:inline">
     <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.50"
@@ -180,11 +180,11 @@
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-6)"
+     transform="translate(0,-5)"
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 4422c9ee5..24f156c80 100644
--- a/themes/default/right-active.png
+++ b/themes/default/right-active.png
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
index 2c31f6ede..dd09adb53 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 4422c9ee5..24f156c80 100644
--- a/themes/default/right-inactive.png
+++ b/themes/default/right-inactive.png
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
index 5c6050219..5157cfef3 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -14,7 +14,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 32a1f4c7e..fafd0dc3b 100644
--- a/themes/default/shade-active.png
+++ b/themes/default/shade-active.png
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
index 4be10205f..1c5c3adc1 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -211,7 +224,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index bdf249bc8..6d1adf903 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index e066fcd4c..0f8ebfd90 100644
--- a/themes/default/shade-inactive.png
+++ b/themes/default/shade-inactive.png
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
index d42aa077f..d5d00bcf5 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -198,7 +198,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index cd0a08f58..df61e103e 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index f6de33e9b..bb687e465 100644
--- a/themes/default/shade-prelight.png
+++ b/themes/default/shade-prelight.png
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
index a653fbf15..7cddc0f88 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index 07dfa424c..c5ad1d308 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index aaf65c558..111dd66fc 100644
--- a/themes/default/shade-pressed.png
+++ b/themes/default/shade-pressed.png
diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg
index 4595a5a16..a99fb2024 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 07dfa424c..c5ad1d308 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 470b9b127..1d63b854c 100644
--- a/themes/default/shade-toggled-active.png
+++ b/themes/default/shade-toggled-active.png
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
index c3fd77bff..a49832899 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -211,7 +224,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 4e8e1ca7b..2f122779a 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_toggled_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index add3e3c0f..29dc852c4 100644
--- a/themes/default/shade-toggled-inactive.png
+++ b/themes/default/shade-toggled-inactive.png
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
index 7d9341f99..901f9a11f 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -198,7 +198,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index b2aba2341..ba4183c03 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_toggled_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index ba0e8ce52..0a19d0a2c 100644
--- a/themes/default/shade-toggled-prelight.png
+++ b/themes/default/shade-toggled-prelight.png
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
index 6cac12a3a..12ccf631c 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index edcb1dad0..51416e1be 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index de1f90560..85ed2adba 100644
--- a/themes/default/shade-toggled-pressed.png
+++ b/themes/default/shade-toggled-pressed.png
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
index f7ff8268e..f95ee79bc 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="shade-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index edcb1dad0..51416e1be 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * shade_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index 1dbb198f0..6628ea743 100644
--- a/themes/default/stick-active.png
+++ b/themes/default/stick-active.png
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
index 85a64582a..7213038a5 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -211,7 +224,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 9ac49f53b..b696abb54 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index ecc3a35af..77eee057c 100644
--- a/themes/default/stick-inactive.png
+++ b/themes/default/stick-inactive.png
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
index 0c650991a..1dd31d696 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -198,7 +198,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 309527f53..08b7c64b1 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index 5b10590f6..8c5ca3b71 100644
--- a/themes/default/stick-prelight.png
+++ b/themes/default/stick-prelight.png
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
index f3e9fadf0..8dece9d46 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index ed5cabcd3..029784adc 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index e777be123..53f053a45 100644
--- a/themes/default/stick-pressed.png
+++ b/themes/default/stick-pressed.png
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
index 70c965dc5..6822cf479 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -238,7 +251,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index ed5cabcd3..029784adc 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 47bd88773..9f66ad94a 100644
--- a/themes/default/stick-toggled-active.png
+++ b/themes/default/stick-toggled-active.png
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
index c0fe8ba29..54c3c7d54 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -104,6 +104,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -154,7 +163,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -166,7 +175,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -176,6 +185,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -220,7 +233,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index bd2ca51eb..8300123d4 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_toggled_active_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index b2424573a..1e7ac37f4 100644
--- a/themes/default/stick-toggled-inactive.png
+++ b/themes/default/stick-toggled-inactive.png
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
index 56103d6cd..79a19fec1 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -207,7 +207,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index ae842ef7a..f30767601 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_toggled_inactive_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index 64640a42c..7510c77e0 100644
--- a/themes/default/stick-toggled-prelight.png
+++ b/themes/default/stick-toggled-prelight.png
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
index 12e50db76..60f1d7417 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-toggled-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -193,7 +202,7 @@
        d="M 0,1 L 24,1 C 24,1 24,4 24,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"
+       style="opacity:0.25;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="24"
        height="14"
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -247,7 +260,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index e65a41324..3e20e336a 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index dc6c1a73a..87bf11fc5 100644
--- a/themes/default/stick-toggled-pressed.png
+++ b/themes/default/stick-toggled-pressed.png
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
index ec9b999e4..1053aebae 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="stick-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -115,6 +115,15 @@
        x2="0"
        y2="25"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5873"
+       id="linearGradient4147"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,7 +190,7 @@
      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 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -203,6 +212,10 @@
        style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
        d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
        id="path2187" />
+    <path
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.60"
+       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
+       id="path2188" />
   </g>
   <g
      inkscape:label="Border"
@@ -247,7 +260,7 @@
      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.05"
-       d="M 0.5,28.5 L 23.5,28.5"
+       d="M 0.5,26.5 L 23.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index e65a41324..3e20e336a 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"24 29 2 1",
+"24 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "........................",
@@ -29,6 +29,4 @@ static char * stick_toggled_pressed_xpm[] = {
 "........................",
 "........................",
 "........................",
-"........................",
-"........................",
 "........................"};
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-1-active.png
+++ b/themes/default/title-1-active.png
diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg
index a22406535..72d24bf7d 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-1-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 3c1149c1d..e8585b791 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-1-inactive.png
+++ b/themes/default/title-1-inactive.png
diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg
index 7801203d0..2298c7992 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-1-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 6c865cc53..c27c70b04 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-2-active.png
+++ b/themes/default/title-2-active.png
diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg
index 44bb42c63..9fdf4ae15 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-2-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 3c1149c1d..e8585b791 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-2-inactive.png
+++ b/themes/default/title-2-inactive.png
diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg
index f5082ca03..9ba1e4c6e 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-2-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 6c865cc53..c27c70b04 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-3-active.png
+++ b/themes/default/title-3-active.png
diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg
index e521a794d..982911e4c 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-3-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 3c1149c1d..e8585b791 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-3-inactive.png
+++ b/themes/default/title-3-inactive.png
diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg
index bb755e58d..1faee04fc 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-3-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 6c865cc53..c27c70b04 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-4-active.png
+++ b/themes/default/title-4-active.png
diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg
index 7e167206a..addfd0306 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-4-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 3c1149c1d..e8585b791 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-4-inactive.png
+++ b/themes/default/title-4-inactive.png
diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg
index c755798fb..b0c1833b8 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-4-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 6c865cc53..c27c70b04 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-5-active.png
+++ b/themes/default/title-5-active.png
diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg
index 7d583c242..e5e8a4c9e 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-5-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 3c1149c1d..e8585b791 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index adca4d744..e33afe621 100644
--- a/themes/default/title-5-inactive.png
+++ b/themes/default/title-5-inactive.png
diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg
index e51772ed6..1333a69fd 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="title-5-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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,28 8,28 L 0,28 L 0,0.5 z "
+       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
@@ -180,7 +180,7 @@
      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.05"
-       d="M 0.5,28.5 L 7.5,28.5"
+       d="M 0.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 6c865cc53..c27c70b04 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 29 2 1",
+"4 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -29,6 +29,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index a2becfdf4..6f2f40912 100644
--- a/themes/default/top-left-active.png
+++ b/themes/default/top-left-active.png
diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg
index f832bef49..4659a9e58 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="top-left-active.svg"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    version="1.0"
    inkscape:version="0.45.1"
    sodipodi:version="0.32"
    id="svg2"
-   height="29"
+   height="27"
    width="8"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -146,7 +146,7 @@
     <path
        id="path6057"
        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-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,21 C 1,21 1,26 6,26 L 8,26 L 8,26 L 8,1 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -177,7 +177,7 @@
      inkscape:groupmode="layer">
     <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.05"
-       d="M 2.5,28.5 L 7.5,28.5"
+       d="M 2.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 9b1fcce2c..d6816b705 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 29 2 1",
+"8 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "  ......",
@@ -29,6 +29,4 @@ static char * top_left_active_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index a2becfdf4..6f2f40912 100644
--- a/themes/default/top-left-inactive.png
+++ b/themes/default/top-left-inactive.png
diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg
index 7486fdab9..97c30dd3e 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="top-left-inactive.svg"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    version="1.0"
    inkscape:version="0.45.1"
    sodipodi:version="0.32"
    id="svg2"
-   height="29"
+   height="27"
    width="8"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -146,7 +146,7 @@
     <path
        id="path6057"
        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-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,23 C 1,23 1,28 6,28 L 8,28 L 8,28 L 8,1 z " />
+       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,21 C 1,21 1,26 6,26 L 8,26 L 8,26 L 8,1 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -177,7 +177,7 @@
      inkscape:groupmode="layer">
     <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.05"
-       d="M 2.5,28.5 L 7.5,28.5"
+       d="M 2.5,26.5 L 7.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 5f4e40abf..3b6c91967 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 29 2 1",
+"8 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "  ......",
@@ -29,6 +29,4 @@ static char * top_left_inactive_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index e7de17e98..72b4e2753 100644
--- a/themes/default/top-right-active.png
+++ b/themes/default/top-right-active.png
diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg
index 8e1e046ab..999207656 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="top-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 5,1 C 5,1 7,1 7,4 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,21 C 7,21 7,26 2,26 L 0,26 L 0,26 L 0,1 z "
        id="path6057" />
   </g>
   <g
@@ -177,7 +177,7 @@
      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.05"
-       d="M 0.5,28.5 L 5.5,28.5"
+       d="M 0.5,26.5 L 5.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 56545c3df..e89d09cb7 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 29 2 1",
+"8 27 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "......  ",
@@ -29,6 +29,4 @@ static char * top_right_active_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index e7de17e98..72b4e2753 100644
--- a/themes/default/top-right-inactive.png
+++ b/themes/default/top-right-inactive.png
diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg
index 281446de0..5518452bf 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="29"
+   height="27"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
    sodipodi:docname="top-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="28.5"
+       y2="26.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -145,7 +145,7 @@
      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 5,1 C 5,1 7,1 7,4 L 7,23 C 7,23 7,28 2,28 L 0,28 L 0,28 L 0,1 z "
+       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,21 C 7,21 7,26 2,26 L 0,26 L 0,26 L 0,1 z "
        id="path6057" />
   </g>
   <g
@@ -177,7 +177,7 @@
      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.05"
-       d="M 0.5,28.5 L 5.5,28.5"
+       d="M 0.5,26.5 L 5.5,26.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 8be602e38..315ca338e 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 29 2 1",
+"8 27 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "......  ",
@@ -29,6 +29,4 @@ static char * top_right_inactive_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
 "........"};