* src/parserc.c, src/settings.c, src/settings.c: Fix settings not

	  being set at startup (Bug #4845)
	  themes/default/*: Flatten default theme

(Old svn revision: 29303)

120 files changed, 388 insertions, 4470 deletions

diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index 5ab5c4fc4..2bcf6048c 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 ab6cad115..74431c8b7 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -61,7 +61,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
@@ -70,7 +70,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index c5a5bda3b..08bf4e6cc 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 8aa0008c2..e051d3ab8 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -61,7 +61,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
@@ -70,7 +70,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 3a6c6b66f..dd2af1bb6 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 e6957ade6..b5bca37cc 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -60,7 +60,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 83bb48623..6f836259d 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 349c907e7..cf554862f 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -60,7 +60,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index e7a1ff3cd..f78acd904 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 aa1d7b643..3b843c4a6 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -60,7 +60,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 14.5,0 L 14.5,13.5 C 14.5,14.5 14.5,14.5 13.5,14.5 C 14.5,14.5 0,14.5  0,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index 5571afed2..43187f791 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 0a2437776..aaabf3e49 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -60,7 +60,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 8eda75b6b..1feedbbd7 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 38cafa02b..b163a631f 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index e410f7d94..f254b828d 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 639f83882..f149e089a 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
index ace693483..426c6add9 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 b28516f83..c61203c49 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index f98149f71..1fedc3454 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 c350f144b..44c2077bc 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index 7895d154d..7c4259e09 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 799a72aa2..c46e83d9c 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index ecffeeb06..2a7f4c30a 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 dd3f4fee7..c52ee538c 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
index f52796ed4..d59c9ae36 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 c93c46b3b..4ee636ae0 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index d10857109..4332e098b 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 10344cdf5..1c552a108 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index 5e180707a..db0098561 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 26a852c2d..13a5be952 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -59,7 +59,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 1.5,0 L 1.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index d7ed013f0..f8af019e9 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 d7ab4143f..a599ff30e 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -59,7 +59,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 1.5,0 L 1.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index 2244ec213..3fe822803 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 d11fe7069..7e5e23cba 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 566049d1e..e1b94f098 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 aadb3b2f9..4d67a63bc 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
index 8ec301c74..57b00ade5 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 00f4c7633..c8a7d8158 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index 3f86f1357..9fa582c1c 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 fc5040db2..28823173c 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 78cb28d15..15fb7b208 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 454465f9f..3dc5fe961 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 26f42546e..b4b87b6c3 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 2f70c52a2..00635bb41 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
index b1c0fb013..60400e0bd 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 0bf209cf4..f44bcf53e 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 6ba523cb0..db337784c 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 d772c0be3..25d463ae4 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index b0c5ab04a..5de6127f1 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 5c8cd3230..e5da918d8 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <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"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
index ea4b58b4f..5de6127f1 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 d2900f15c..7e67caed7 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -168,22 +122,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +130,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
index b0c5ab04a..5de6127f1 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 9bb7cb238..59de280e9 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <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"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index b0c5ab04a..5de6127f1 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 25b385e35..5ef213480 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <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"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index ecf20454a..0711889b3 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 226a6851a..d981702f2 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -59,7 +59,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index d8aa7cc11..4a7acb1f1 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 0b3802f22..4531f86b7 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -59,7 +59,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 731faa364..0cd9f2ba8 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 a6b855643..a88d58945 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index d46144af2..57f5ba740 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 f6b932803..35aee95be 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
index 40d71cadb..641ecf39c 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 b3e3e562c..80535c2d8 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index 8aac51f06..745fe5fa7 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 d83046a51..a997ff155 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 7467ee847..004972bf3 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 fb937de28..5331d9e14 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index b61c4415b..f5d79ade5 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 8f59d9fdb..8b5538009 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
index 2a0bc1a73..56ed4fe19 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 deda410ce..9b3c5112e 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index 75fae6208..843bd7e79 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 ef347f3d2..a4cbc8610 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index bae002cf8..151e7ac08 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 a95f3dcec..cc5c73c20 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 0dca69077..9a721493a 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 ac30fd55f..ee092de4d 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
index 389e085ba..cd0de1a8d 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 6f2b07450..9ce436461 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index 723a0de03..bc2a28f54 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 ffe1e2790..5f611a94e 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 62fe5d59f..2c1538282 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 22f0c2ba5..54ef25dd5 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,64 +36,6 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
@@ -170,42 +101,22 @@
   </metadata>
   <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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index cefc44a41..45297c48d 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 ea3ccbd0b..3917c3c68 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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"
-       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="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
index 5b41de91d..a164db892 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 8c2c64b68..be51f96b0 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 4a874cf09..bea1e9b05 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 965d23dcf..3573b0900 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          offset="1"
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        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"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </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"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index a8e39c0db..25961e215 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 179aa9ca2..41e6bf0d0 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,82 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -155,7 +79,7 @@
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -163,28 +87,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -197,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index bdbbc7533..de5e92aa1 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 106ec69d1..f038b8635 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     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 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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index a8e39c0db..25961e215 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 fd2f26cef..b59e5b7a8 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index bdbbc7533..de5e92aa1 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 7127155e8..c81365c3e 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     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 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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index a8e39c0db..25961e215 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 44ea35974..d84f4fddb 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index bdbbc7533..de5e92aa1 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 d38ea7ead..c9f63d697 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     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 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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index a8e39c0db..25961e215 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 8a82f1f9a..c7e20f596 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index bdbbc7533..de5e92aa1 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 2267c74ed..0816a08fc 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     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 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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index a8e39c0db..25961e215 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 8daeca626..fb648a1e2 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      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:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index bdbbc7533..de5e92aa1 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 15c8b57d9..d9daf099f 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     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 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.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 610ac529b..da2146c60 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 987b88fc5..950ba2b66 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -6,7 +6,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="top-left-active.svg"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,23 +80,10 @@
      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"
+       style="fill:none;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,17 C 1,17 1,22 6,22 L 8,22 L 8,22 L 8,1 z " />
   </g>
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       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"
@@ -181,7 +91,7 @@
     <path
        id="rect1319"
        d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:label="Shadow"
@@ -192,7 +102,7 @@
        d="M 2.5,21.5 L 7.5,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        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,24"
        id="path2170" />
   </g>
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 57139bd59..a9eb92182 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 f69343174..3c0b96c85 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,19 +115,6 @@
        d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,17 C 1,17 1,22 6,22 L 8,22 L 8,22 L 8,1 z " />
   </g>
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       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.50;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.60;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"
@@ -181,7 +122,7 @@
     <path
        id="rect1319"
        d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:label="Shadow"
@@ -192,7 +133,7 @@
        d="M 2.5,21.5 L 7.5,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        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,24"
        id="path2170" />
   </g>
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index d81889a67..82c530e8b 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 f9858cea1..e2235afb9 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,24 +79,11 @@
      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"
+       style="fill:none;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,17 C 7,17 7,22 2,22 L 0,22 L 0,22 L 0,1 z "
        id="path6057" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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"
@@ -181,7 +91,7 @@
     <path
        id="rect1319"
        d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -192,9 +102,8 @@
        d="M 0.5,21.5 L 5.5,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        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,24"
        id="path2170" />
-
   </g>
 </svg>
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index 4d1cbbe1d..419c36a18 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 d3117934f..cb4b85699 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       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)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,19 +115,6 @@
        id="path6057" />
   </g>
   <g
-     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 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.60;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"
@@ -181,7 +122,7 @@
     <path
        id="rect1319"
        d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -192,7 +133,7 @@
        d="M 0.5,21.5 L 5.5,21.5"
        id="path6989" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        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,24"
        id="path2170" />
   </g>