Huh, the wrong stuff was commited yesterday...

(Old svn revision: 27024)
author: Olivier Fourdan <fourdan.olivier@wanadoo.fr> 2008-06-03 20:39:45 +0000
committer: Olivier Fourdan <fourdan.olivier@wanadoo.fr> 2008-06-03 20:39:45 +0000
commit: 51013374e43927bd38fb00eb8cfa7fbaae517bf3 (patch)
tree: d4cab91d337136afe725ce2b2bbdbca1cd0150df /themes
parent: 3eb1788cc3c7319ecd36bef08bf8fa4d5a771b6a (diff)
download: xfwm4-51013374e43927bd38fb00eb8cfa7fbaae517bf3.tar.gz
182 files changed, 4634 insertions, 5494 deletions
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index dad484edb..675ff2ced 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Kokodi/xfwm4
+themedir = $(datadir)/themes/Default/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 547c71fc5..dd7d55914 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 513b26346..1061bfc78 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -86,9 +85,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 0,5.5 L 24,5.5"
        id="path1340" />
   </g>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 05b089ae5..af481a2c1 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -6,7 +6,7 @@ static char * bottom_active_xpm[] = {
 "@	c #C0C0FF s active_color_1",
 "########################",
 "########################",
-"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index 547c71fc5..c7111c587 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 31c4e63a4..ec45610db 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -86,9 +85,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 0,5.5 L 24,5.5"
        id="path1340" />
   </g>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index ad03c07ae..f70bcabb5 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -6,7 +6,7 @@ static char * bottom_inactive_xpm[] = {
 "@	c #C0C0FF s inactive_color_1",
 "########################",
 "########################",
-"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 84611f719..b1140bb71 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 c0f8ae2ab..d3d9f2881 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -87,7 +86,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.20"
+       style="fill:black;fill-opacity:0.50"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 42f3c164e..8eb1e7d77 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_active_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@#############",
-"@@@#############",
-"@@@#############",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@############",
+"@@@@############",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 84611f719..e96896ecb 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 eaf49ad05..8f40226c9 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -87,7 +86,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.20"
+       style="fill:black;fill-opacity:0.50"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index a1ddb0c4b..52498ef0b 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_inactive_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@###          ",
-"@@@#############",
-"@@@#############",
-"@@@#############",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@############",
+"@@@@############",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index 5a9b57e37..8175e4c8d 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 462f51704..f883962cc 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -87,7 +86,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.20"
+       style="fill:black;fill-opacity:0.50"
        d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 159230751..e9c153527 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_active_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"#############@@@",
-"#############@@@",
-"#############@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"############@@@@",
+"############@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index 5a9b57e37..318e397b4 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 5e81277fe..a1f90359c 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -87,7 +86,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.20"
+       style="fill:black;fill-opacity:0.50"
        d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 42a8e492f..43420e08f 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_inactive_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"          ###@@@",
-"#############@@@",
-"#############@@@",
-"#############@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"############@@@@",
+"############@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 72fa30ab9..2d8ffc20b 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 1110e7190..8e048f1c0 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,76 +172,50 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index d255e0ba4..d5c777374 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index d92c911e0..2733145f0 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 e3b344ced..f53816dc6 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,59 +172,37 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index c57f58d5e..bde5d4415 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index 68aa09ca9..4af0277ef 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 0dfc78acb..7f5d8fe7f 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#ffd0d0;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#ffd0d0;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,76 +186,50 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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" />
+       y="12" />
     <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.50"
-       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" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index 8b6d28347..d5c777374 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * close_pressed_xpm[] = {
-"24 28 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 50d60f919..bfade6ae0 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 63bcb9731..ce811d7ae 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#ffd0d0;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#ffd0d0;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,76 +186,50 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g3722"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,5)">
+       id="g2328"
+       transform="translate(3,8)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 8b6d28347..d5c777374 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * close_pressed_xpm[] = {
-"24 28 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index d35dde136..ad560ff3f 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 a826607af..cb478acc1 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -209,16 +195,16 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <rect
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"
          width="8"
          height="4"
          x="2"
          y="7" />
       <rect
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
@@ -226,13 +212,4 @@
          y="8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 95b703ee7..ffa5e9d76 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index e14dc4968..a25077a35 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 0afdf930e..7af026228 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -187,9 +195,9 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <rect
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
@@ -197,13 +205,4 @@
          y="8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 5a3bdce91..fcc8b1312 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index f9efe95ed..9383c4ffe 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 118d5e4d5..9181b210e 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,56 +186,39 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <rect
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"
          width="8"
          height="4"
          x="2"
          y="7" />
       <rect
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
@@ -253,13 +226,4 @@
          y="8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index 06d93779f..ffa5e9d76 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * hide_pressed_xpm[] = {
-"24 28 2 1",
+static char * hide_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index fd8dd1d94..126614436 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 f705b5cdd..c1433e2a2 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -236,16 +209,16 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,5)">
+       transform="translate(3,8)">
       <rect
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"
          width="8"
          height="4"
          x="2"
          y="7" />
       <rect
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
@@ -253,13 +226,4 @@
          y="8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 06d93779f..ffa5e9d76 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * hide_pressed_xpm[] = {
-"24 28 2 1",
+static char * hide_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index ce79b04af..e0602838f 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 09cf390c4..751057e94 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="left-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -84,9 +83,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 121053a40..2428adb5a 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -4,27 +4,27 @@ static char * left_active_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###"};
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index ce79b04af..3d7c9f75c 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 988a1a8e3..23ff01747 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="left-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -84,9 +83,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index 079ae5926..2e0dd60d3 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -4,27 +4,27 @@ static char * left_inactive_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###",
-"@@@###"};
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##",
+"@@@@##"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index f6d463a12..8f25e0f38 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 f01344405..c2d2deaef 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
-         id="rect2276"
+         id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
-         id="rect2275"
+         id="rect2285"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 62a15801d..5ec094da2 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 880e55a0f..47efd9521 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 647a07501..2daab1781 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -186,21 +194,12 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1627"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         id="rect2275" />
+         id="rect2285" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index fef091db9..0fbdd0d57 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index 1efb0ac44..7605ce915 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 1ac9e6bf4..6a10ef48a 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,64 +186,38 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
-         id="rect2276"
+         id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
-         id="rect2275"
+         id="rect2285"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index c91fbf147..5ec094da2 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * maximize_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index ed9b4d2c6..946893155 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 93612dcd2..2127b8fa2 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(6,5)">
+       transform="translate(3,8)">
       <path
-         id="rect2276"
+         id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
-         id="rect2275"
+         id="rect2285"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index c91fbf147..5ec094da2 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * maximize_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 50b4c494f..eb21698ec 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 b3e4eb4a4..9aa6ac669 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -208,29 +194,20 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1627"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="rect2371"
          d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index de33ff823..de884b3b8 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 97ee9a474..15383a502 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 71abed660..b62705188 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -187,24 +195,15 @@
     <g
        style="display:inline"
        id="g1639"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="rect2371"
          d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 4d894c19c..5dc29b3ba 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index d312dfd15..a84c713bd 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 ad802f6e1..be63ff086 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,68 +186,42 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1627"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="rect2371"
          d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index b07da63e6..de884b3b8 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 0e95cb7b3..1175472b5 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 56e2a8852..18a297049 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="maximize-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -235,29 +208,20 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1627"
-       transform="translate(6,5)">
+       id="g1624"
+       transform="translate(3,8)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="rect2371"
          d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index b07da63e6..de884b3b8 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * maximize_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 4bcb15fab..2f1314e3f 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 c49694346..4d0c56fd0 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="menu-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,58 +146,46 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-6)"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     transform="translate(0,-6)"
-     inkscape:label="Shadow">
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 23.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 3a9d0f45a..0b60759d1 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,23 +1,29 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                ",
+"                ",
+"                ",
+"                ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"                ",
+"                "};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index 6f280f9b4..cdf07269c 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 2d95c1d8a..f18835ea6 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="menu-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,58 +146,46 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-6)"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     transform="translate(0,-6)"
-     inkscape:label="Shadow">
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 23.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 8f07169eb..c004dee54 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,23 +1,29 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                ",
+"                ",
+"                ",
+"                ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"                ",
+"                "};
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index fcc67bfee..2f1314e3f 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 7d74450c9..a861545ba 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="menu-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,58 +146,46 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-6)"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     transform="translate(0,-6)"
-     inkscape:label="Shadow">
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 23.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
index 3a9d0f45a..0b60759d1 100644
--- a/themes/default/menu-prelight.xpm
+++ b/themes/default/menu-prelight.xpm
@@ -1,23 +1,29 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                ",
+"                ",
+"                ",
+"                ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"                ",
+"                "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index fcc67bfee..2f1314e3f 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 e424f4385..a065f6610 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="menu-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,58 +146,46 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-6)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-6)"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-6)"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     transform="translate(0,-6)"
-     inkscape:label="Shadow">
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 23.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index bfe19e1c8..0b60759d1 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,22 +1,29 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 17 2 1",
+"16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                ",
+"                ",
+"                ",
+"                ",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................",
+"                ",
+"                "};
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 1f58cf04a..ee7347969 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 6bbdd4150..c2c46e8d6 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -84,9 +83,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 5.5,0 L 5.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 634908f0c..caad32306 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -4,27 +4,27 @@ static char * right_active_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@"};
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 1f58cf04a..2feb99a30 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 99c3e130b..2b8fbd754 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -16,8 +16,7 @@
    version="1.0"
    sodipodi:docbase="/themes/default"
    sodipodi:docname="right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -84,9 +83,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="border">
+     id="layer1">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
        d="M 5.5,0 L 5.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index a9894c017..45b2a4f2b 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -4,27 +4,27 @@ static char * right_inactive_xpm[] = {
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@",
-"###@@@"};
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@",
+"##@@@@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 427a1a106..2c192fc92 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 67423f028..d0f335a5d 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index e63dd62fd..f7ab9745f 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 291760d96..36fbe6a35 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 4f38510cb..8c8668ff8 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -187,20 +195,11 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
-         id="path2720"
-         style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420"
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
          d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 84afd3297..5008b2c59 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index 0f9bc6e4e..426568b51 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 83be89760..3f8f27b36 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,64 +186,38 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index c6e14ec43..f7ab9745f 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * shade_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index d2ab55e5f..2cf088945 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 0dddaa3f3..58df3586c 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,5)">
+       transform="translate(3,8)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index c6e14ec43..f7ab9745f 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * shade_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 27c7be825..8383c2d2e 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 0be456383..bf63f4529 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -208,25 +194,16 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1628"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index ccdc70913..e5f40e2c8 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index a6005868f..e3dd6013c 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 9afb5bbf8..6e3d4c4d6 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -186,21 +194,12 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1628"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
-         id="path2720"
-         style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420"
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
          d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 7f94137fb..056cfab4e 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index cc526c06e..2ea5d4b7e 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 5ff58030e..d5874577e 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,64 +186,38 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1628"
-       transform="translate(6,4)">
+       id="g1624"
+       transform="translate(3,7)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index 0f68410d9..e5f40e2c8 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index ca97d699f..ed876c4ac 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 9cb934fdb..3540e4b04 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="shade-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -235,25 +208,16 @@
      inkscape:label="Button">
     <g
        style="display:inline"
-       id="g1628"
-       transform="translate(6,5)">
+       id="g1624"
+       transform="translate(3,8)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
-         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2705" />
+         style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2405" />
       <path
          d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         id="path2720" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         id="path2420" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 0f68410d9..e5f40e2c8 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * shade_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index db37d62a3..d0637eb31 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 2a19ec620..64e4f793a 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -209,24 +195,15 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 635c422f9..fa7ebe7e0 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 3976829b7..f57b506df 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 df2ec0e95..1ff32908a 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -187,20 +195,11 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 581c17a43..a6ccaaae0 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index 16cd89b42..eae779093 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 4ab60fe17..1210a09fa 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,64 +186,38 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index 549ee1a39..fa7ebe7e0 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * stick_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index 0b8b95240..44092f164 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 846fba97b..56b341114 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -236,24 +209,15 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(6,5)">
+       transform="translate(3,8)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 549ee1a39..fa7ebe7e0 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * stick_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 24b852ad1..7da15835d 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 99bf19e1e..c7fe43bf1 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,36 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -125,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -134,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -153,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -169,38 +172,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
-    <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -209,33 +195,20 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="6"
-         sodipodi:cx="6"
-         id="path2292"
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path2282"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          sodipodi:type="arc" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 58f02465e..45c175259 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index b98ba02ce..0fca6ad0e 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 b42cc0fc8..49c7a623a 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -2,34 +2,34 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +172,31 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       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" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
+     id="g22"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path24" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -187,29 +205,16 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="6"
-         sodipodi:cx="6"
          id="path2202"
-         style="opacity:0.25;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          sodipodi:type="arc" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 65e6479bc..ca1bd8536 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,33 +1,29 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"24 28 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index eead4705d..c22f6f05a 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 c60d7237f..fff7675c6 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,73 +186,43 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       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="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="0"
-         sodipodi:cx="6"
-         id="path2292"
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path2282"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          sodipodi:type="arc" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index 69f313f00..45c175259 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 013635086..b430a3b92 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 25fcd1d3b..cea220289 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -2,45 +2,45 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="28"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="stick-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
-         style="stop-color:#d0ffff;stop-opacity:1;" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
          id="stop5877"
          offset="0.5"
-         style="stop-color:#d0ffff;stop-opacity:0.90;" />
+         style="stop-color:white;stop-opacity:0.90;" />
       <stop
          id="stop5879"
          offset="1"
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -81,49 +81,19 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -136,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -145,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -164,19 +146,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -185,10 +175,10 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
-       width="24"
-       height="26"
+       width="18"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -196,38 +186,21 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
+    <path
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       id="path6061" />
     <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       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.50"
-       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"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 24,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -236,33 +209,20 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(6,5)">
+       transform="translate(3,8)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         id="path2287"
+         id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
+         id="path2282"
          d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="0"
-         sodipodi:cx="6"
-         id="path2292"
-         style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          sodipodi:type="arc" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0"
-       d="M 0,27.5 L 24,27.5"
-       id="path6989" />
-  </g>
 </svg>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 69f313f00..45c175259 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,33 +1,29 @@
 /* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"24 28 2 1",
+static char * stick_toggled_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};
diff --git a/themes/default/themerc b/themes/default/themerc
index 1888a1960..80d40c4e1 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
 active_text_color=#ffffff
-button_offset=0
+button_offset=-2
 button_spacing=0
 full_width_title=false
 maximized_offset=0
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index a4fcfafe8..02251c618 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 77b668dc7..13aabc91d 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-1-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,25 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -82,40 +83,51 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="40"
-     inkscape:cx="-3.2737067"
-     inkscape:cy="-1.198171"
+     inkscape:zoom="10"
+     inkscape:cx="0"
+     inkscape:cy="0"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
-     inkscape:window-width="1351"
-     inkscape:window-height="754"
-     inkscape:window-x="423"
-     inkscape:window-y="101"
+     inkscape:window-width="640"
+     inkscape:window-height="400"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -134,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -151,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 9f656fef3..518b43936 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index cb3f99707..b4f4729d5 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 a993c95e9..0f0d71322 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-1-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index b97494023..a334c0d6b 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index a4fcfafe8..02251c618 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 b3d29c9d1..14a206c7f 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-2-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 9f656fef3..518b43936 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index cb3f99707..5a32c7887 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 bd17c1c9c..fa34f3fb4 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-2-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index b97494023..a334c0d6b 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index a4fcfafe8..ecee8cdd3 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 7ddcb92f9..382e1abac 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-3-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 9f656fef3..518b43936 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index cb3f99707..5a32c7887 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 669254339..60713a2fd 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-3-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index b97494023..a334c0d6b 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index a4fcfafe8..ecee8cdd3 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 25dc30ecd..c04f1fac2 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-4-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 9f656fef3..518b43936 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index cb3f99707..5a32c7887 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 16e5f36b1..3badd8637 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-4-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index b97494023..a334c0d6b 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index a4fcfafe8..ecee8cdd3 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 ac017749b..193653a10 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-5-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 9f656fef3..518b43936 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_active_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index cb3f99707..5a32c7887 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 072dc364d..b8ec89efb 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="title-5-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,7 +106,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -116,7 +114,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,15 +146,25 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 7.5,0.5"
+       id="path6059" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="26"
+       height="12"
        x="0"
        y="1" />
   </g>
@@ -152,34 +173,19 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
        width="8"
-       height="15"
+       height="12"
        x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+       y="12" />
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.20"
-       d="M 0,0.5 L 8,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0,27.5 L 8,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 8,1.5"
+       id="path6061" />
   </g>
 </svg>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index b97494023..a334c0d6b 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 28 2 1",
+"4 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -26,8 +26,4 @@ static char * title_inactive_xpm[] = {
 "....",
 "....",
 "....",
-"....",
-"....",
-"....",
-"....",
 "...."};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 73fdecac7..2b5bf8711 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 129e47263..3612180a9 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    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="/themes/default"
    version="1.0"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    sodipodi:version="0.32"
    id="svg2"
-   height="28"
+   height="24"
    width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
      inkscape:window-height="733"
      inkscape:window-x="187"
-     inkscape:window-y="728"
+     inkscape:window-y="724"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -136,13 +147,23 @@
   </metadata>
   <g
      style="display:inline"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Border">
+    <path
+       id="rect1319"
+       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+       style="fill:#000000;fill-opacity:0.50" />
+  </g>
+  <g
+     style="display:inline"
      inkscape:label="Grad"
      id="layer2"
      inkscape:groupmode="layer">
     <path
        id="path6057"
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,22 C 1,22 1,27 6,27 L 8,27 L 8,27 L 8,1 z " />
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;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 4,1 C 3,1 1,1 1,3 C 1,7.5 1,10 1,13 L 8,13 L 8,13 L 8,1 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -153,27 +174,12 @@
        d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
-       id="path1884" />
-  </g>
-  <g
-     style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Border">
-    <path
-       id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,28 1,28 1,28 L 0,28 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.20" />
-  </g>
-  <g
-     inkscape:label="Shadow"
-     id="layer5"
-     inkscape:groupmode="layer">
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+       id="path2396" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,27.5 L 7.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+       id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 8a8f571df..355367ddb 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 28 2 1",
+"8 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "  ......",
@@ -26,8 +26,4 @@ static char * top_left_active_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 2429bbe39..9aae49070 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 f64c8870c..c13413e44 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    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="/themes/default"
    version="1.0"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    sodipodi:version="0.32"
    id="svg2"
-   height="28"
+   height="24"
    width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
      inkscape:window-height="733"
      inkscape:window-x="187"
-     inkscape:window-y="728"
+     inkscape:window-y="724"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -136,13 +147,23 @@
   </metadata>
   <g
      style="display:inline"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Border">
+    <path
+       id="rect1319"
+       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+       style="fill:#000000;fill-opacity:0.50" />
+  </g>
+  <g
+     style="display:inline"
      inkscape:label="Grad"
      id="layer2"
      inkscape:groupmode="layer">
     <path
        id="path6057"
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,22 C 1,22 1,27 6,27 L 8,27 L 8,27 L 8,1 z " />
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;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 4,1 C 3,1 1,1 1,3 C 1,7.5 1,10 1,13 L 8,13 L 8,13 L 8,1 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -153,27 +174,12 @@
        d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
        style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
-       id="path1884" />
-  </g>
-  <g
-     style="display:inline"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Border">
-    <path
-       id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,28 1,28 1,28 L 0,28 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.20" />
-  </g>
-  <g
-     inkscape:label="Shadow"
-     id="layer5"
-     inkscape:groupmode="layer">
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+       id="path2396" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,27.5 L 7.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+       id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index b9eff7f25..c02156857 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 28 2 1",
+"8 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "  ......",
@@ -26,8 +26,4 @@ static char * top_left_inactive_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index b5bb60986..04750bc7e 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 ae6dcd020..1945bfa1e 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="top-right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
      inkscape:window-height="733"
      inkscape:window-x="187"
-     inkscape:window-y="728"
+     inkscape:window-y="724"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,45 +146,40 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       id="rect1319"
+       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+       style="fill:#000000;fill-opacity:0.50" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,22 C 7,22 7,27 2,27 L 0,27 L 0,27 L 0,1 z "
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;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,3 C 7,7.5 7,10 7,13 L 0,13 L 0,13 L 0,1 z "
        id="path6057" />
   </g>
   <g
-     inkscape:groupmode="layer"
+     inkscape:label="hilight"
      id="layer3"
-     inkscape:label="hilight">
+     inkscape:groupmode="layer">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
        id="path6061" />
     <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
-       id="path1884" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,28 7,28 7,28 L 8,28 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.20" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+       id="path2396" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 5.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+       id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index d33ccf4b7..1b3acf7b7 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 28 2 1",
+"8 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "......  ",
@@ -28,6 +28,4 @@ static char * top_right_active_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
 "........"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index ab230e47d..dd0861e7c 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 57da706dd..69ef803c5 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -10,26 +10,26 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="28"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="top-right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
        id="linearGradient5873">
@@ -51,26 +51,26 @@
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
+       y1="1"
        x2="0"
-       y2="27.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
+       y2="18"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -83,18 +83,17 @@
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -107,16 +106,28 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
      inkscape:window-height="733"
      inkscape:window-x="187"
-     inkscape:window-y="728"
+     inkscape:window-y="724"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -135,45 +146,40 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       id="rect1319"
+       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+       style="fill:#000000;fill-opacity:0.50" />
+  </g>
+  <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,22 C 7,22 7,27 2,27 L 0,27 L 0,27 L 0,1 z "
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;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,3 C 7,7.5 7,10 7,13 L 0,13 L 0,13 L 0,1 z "
        id="path6057" />
   </g>
   <g
-     inkscape:groupmode="layer"
+     inkscape:label="hilight"
      id="layer3"
-     inkscape:label="hilight">
+     inkscape:groupmode="layer">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.20;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
        id="path6061" />
     <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
-       id="path1884" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,28 7,28 7,28 L 8,28 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.20" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+       id="path2396" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,27.5 L 5.5,27.5"
-       id="path6989" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+       id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 15ea11883..0d1002559 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 28 2 1",
+"8 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "......  ",
@@ -26,8 +26,4 @@ static char * top_right_inactive_xpm[] = {
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
-"........",
 "........"};
author	Olivier Fourdan <fourdan.olivier@wanadoo.fr>	2008-06-03 20:39:45 +0000
committer	Olivier Fourdan <fourdan.olivier@wanadoo.fr>	2008-06-03 20:39:45 +0000
commit	51013374e43927bd38fb00eb8cfa7fbaae517bf3 (patch)
tree	d4cab91d337136afe725ce2b2bbdbca1cd0150df /themes
parent	3eb1788cc3c7319ecd36bef08bf8fa4d5a771b6a (diff)
download	xfwm4-51013374e43927bd38fb00eb8cfa7fbaae517bf3.tar.gz