New theme for 4.8

109 files changed, 1620 insertions, 1732 deletions

diff --git a/themes/default/README b/themes/default/README
index 7349f4afa..ea23f10b7 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,3 +1,3 @@
 joy - SVG based theme for xfwm4.
-(c) 2006, 2007, 2008 - Olivier Fourdan <fourdan@xfce.org>
+(c) 2006, 2010 - Olivier Fourdan <fourdan@xfce.org>
 Theme released under GNU GPL license.
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
index ec68637e8..b62edf627 100644
--- a/themes/default/bottom-active.svg
+++ b/themes/default/bottom-active.svg
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="4"
+   height="5"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.47 r22583"
@@ -57,21 +57,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 0.5,2.5 L 23.5,2.5"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,3.5 L 23.5,3.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0.5,4.5 L 23.5,4.5"
        id="path1340" />
   </g>
 </svg>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 2c8592dc8..6b71f3afd 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,10 +1,11 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"24 4 3 1",
+"24 5 3 1",
 "   c None",
 "#  c #C0C0C0 s active_color_2",
 "@  c #C0C0FF s active_color_1",
 "########################",
 "########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
+"########################",
+"########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
index ae4602e73..1fcc936f2 100644
--- a/themes/default/bottom-inactive.svg
+++ b/themes/default/bottom-inactive.svg
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="4"
+   height="5"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.47 r22583"
@@ -57,21 +57,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 0.5,2.5 L 23.5,2.5"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,3.5 L 23.5,3.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0.5,4.5 L 23.5,4.5"
        id="path1340" />
   </g>
 </svg>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index c8304d03c..52c089cc1 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,10 +1,11 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"24 4 3 1",
+"24 5 3 1",
 "   c None",
 "#  c #C0C0C0 s inactive_color_2",
 "@  c #C0C0FF s inactive_color_1",
 "########################",
 "########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
+"########################",
+"########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg
index 82aefe1d7..ab11400d5 100644
--- a/themes/default/bottom-left-active.svg
+++ b/themes/default/bottom-left-active.svg
@@ -56,20 +56,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.25"
+       style="fill:#a0a0a0;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 70afeec62..e12d6539c 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_active_xpm[] = {
 "   c None",
 "#  c #C0C0C0 s active_color_2",
 "@  c #C0C0FF s active_color_1",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##############",
-"@@@#############",
-"@@@@@@@@@@@@@@@@",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@###############",
+"@###############",
+"@###############",
+"@###############",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg
index a6d8a5bcb..58a8fe47f 100644
--- a/themes/default/bottom-left-inactive.svg
+++ b/themes/default/bottom-left-inactive.svg
@@ -56,20 +56,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.25"
+       style="fill:#a0a0a0;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 003ca4fc2..d73ee46ee 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_left_inactive_xpm[] = {
 "   c None",
 "#  c #C0C0C0 s inactive_color_2",
 "@  c #C0C0FF s inactive_color_1",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##            ",
-"@@##############",
-"@@@#############",
-"@@@@@@@@@@@@@@@@",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@               ",
+"@###############",
+"@###############",
+"@###############",
+"@###############",
 " @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg
index 98e174693..3899fd044 100644
--- a/themes/default/bottom-right-active.svg
+++ b/themes/default/bottom-right-active.svg
@@ -56,20 +56,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.25"
+       style="fill:#a0a0a0;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index aef30ddfc..3f17497b0 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_active_xpm[] = {
 "   c None",
 "#  c #C0C0C0 s active_color_2",
 "@  c #C0C0FF s active_color_1",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"##############@@",
-"#############@@@",
-"@@@@@@@@@@@@@@@@",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"###############@",
+"###############@",
+"###############@",
+"###############@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg
index db7c8eb98..7ea54d268 100644
--- a/themes/default/bottom-right-inactive.svg
+++ b/themes/default/bottom-right-inactive.svg
@@ -56,20 +56,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       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>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.25"
+       style="fill:#a0a0a0;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 7c880ef38..b1cdc4d89 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -4,19 +4,19 @@ static char * bottom_right_inactive_xpm[] = {
 "   c None",
 "#  c #C0C0C0 s inactive_color_2",
 "@  c #C0C0FF s inactive_color_1",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"            ##@@",
-"##############@@",
-"#############@@@",
-"@@@@@@@@@@@@@@@@",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"               @",
+"###############@",
+"###############@",
+"###############@",
+"###############@",
 "@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
index c11693c7b..a0b057e52 100644
--- a/themes/default/close-active.svg
+++ b/themes/default/close-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 7fa36ac66..19692c199 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -6,7 +6,7 @@ static char * close_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * close_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
index 2cf671489..657b51eb6 100644
--- a/themes/default/close-inactive.svg
+++ b/themes/default/close-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -198,11 +198,11 @@
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 0578207cf..829f6f611 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -6,7 +6,7 @@ static char * close_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * close_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
index 03df782b1..64a93652d 100644
--- a/themes/default/close-prelight.svg
+++ b/themes/default/close-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
index 7fa36ac66..19692c199 100644
--- a/themes/default/close-prelight.xpm
+++ b/themes/default/close-prelight.xpm
@@ -6,7 +6,7 @@ static char * close_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * close_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/close-pressed.svg b/themes/default/close-pressed.svg
index b71fa914a..f62e11697 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/default/close-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,11 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +179,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +199,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 7fa36ac66..19692c199 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -6,7 +6,7 @@ static char * close_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * close_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
index bb37a13f1..e617e94c5 100644
--- a/themes/default/hide-active.svg
+++ b/themes/default/hide-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 43e5f1916..57cee057d 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -6,7 +6,7 @@ static char * hide_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * hide_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
index d9fa10706..281e012d9 100644
--- a/themes/default/hide-inactive.svg
+++ b/themes/default/hide-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -197,7 +197,7 @@
        id="g1616"
        transform="translate(3,6)">
       <rect
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index c02e8f809..537ca5342 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -6,7 +6,7 @@ static char * hide_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * hide_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
index 36435574b..29c842aeb 100644
--- a/themes/default/hide-prelight.svg
+++ b/themes/default/hide-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
index 43e5f1916..57cee057d 100644
--- a/themes/default/hide-prelight.xpm
+++ b/themes/default/hide-prelight.xpm
@@ -6,7 +6,7 @@ static char * hide_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * hide_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
index 5f5bd288d..f4705c770 100644
--- a/themes/default/hide-pressed.svg
+++ b/themes/default/hide-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 43e5f1916..57cee057d 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -6,7 +6,7 @@ static char * hide_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * hide_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
index a904eb276..55ac0de6f 100644
--- a/themes/default/left-active.svg
+++ b/themes/default/left-active.svg
@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4"
+   width="1"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
@@ -55,20 +55,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 1.5,0 L 1.5,24"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       style="fill:none;stroke:#a0a0a0;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-active.xpm b/themes/default/left-active.xpm
index 3ccfc7e07..144b45404 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"4 24 3 1",
+"1 24 3 1",
 "   c None",
 "#  c #C0C0C0 s active_color_2",
 "@  c #C0C0FF s active_color_1",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##"};
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@"};
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
index e8f5e78f2..609bd77e6 100644
--- a/themes/default/left-inactive.svg
+++ b/themes/default/left-inactive.svg
@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4"
+   width="1"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
@@ -55,20 +55,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 1.5,0 L 1.5,24"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       style="fill:none;stroke:#a0a0a0;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.xpm b/themes/default/left-inactive.xpm
index 0f9b5dccf..dc68e6089 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"4 24 3 1",
+"1 24 3 1",
 "   c None",
 "#  c #C0C0C0 s inactive_color_2",
 "@  c #C0C0FF s inactive_color_1",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##",
-"@@##"};
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@"};
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
index ee38da4eb..57b2ac2c6 100644
--- a/themes/default/maximize-active.svg
+++ b/themes/default/maximize-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 3d22c8c3e..1869ca4b9 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -6,7 +6,7 @@ static char * maximize_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
index f8c27c47c..8d190667a 100644
--- a/themes/default/maximize-inactive.svg
+++ b/themes/default/maximize-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -197,7 +197,7 @@
        id="g1624"
        transform="translate(3,6)">
       <path
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
          id="rect2285" />
     </g>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 92e948f50..8af0abda0 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -6,7 +6,7 @@ static char * maximize_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
index 3adf5b06d..49991a46d 100644
--- a/themes/default/maximize-prelight.svg
+++ b/themes/default/maximize-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
index 3d22c8c3e..1869ca4b9 100644
--- a/themes/default/maximize-prelight.xpm
+++ b/themes/default/maximize-prelight.xpm
@@ -6,7 +6,7 @@ static char * maximize_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-pressed.svg b/themes/default/maximize-pressed.svg
index 40b2ff824..e5394db89 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/default/maximize-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 3d22c8c3e..1869ca4b9 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -6,7 +6,7 @@ static char * maximize_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
index c094ecd63..2598e3832 100644
--- a/themes/default/maximize-toggled-active.svg
+++ b/themes/default/maximize-toggled-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 3a9e9e8ae..1627b260a 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -6,7 +6,7 @@ static char * maximize_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
index 9ca4ebd2a..d9c32de3f 100644
--- a/themes/default/maximize-toggled-inactive.svg
+++ b/themes/default/maximize-toggled-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -199,11 +199,11 @@
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="rect2371"
          d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 9ce22081a..4394a280a 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -6,7 +6,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_toggled_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
index 38b26d92b..5af76ba85 100644
--- a/themes/default/maximize-toggled-prelight.svg
+++ b/themes/default/maximize-toggled-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
index 3a9e9e8ae..1627b260a 100644
--- a/themes/default/maximize-toggled-prelight.xpm
+++ b/themes/default/maximize-toggled-prelight.xpm
@@ -6,7 +6,7 @@ static char * maximize_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/default/maximize-toggled-pressed.svg
index 947a97e5e..bd145f3ec 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/default/maximize-toggled-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 3a9e9e8ae..1627b260a 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -6,7 +6,7 @@ static char * maximize_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * maximize_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
index 23b5eac0d..444145f93 100644
--- a/themes/default/menu-active.svg
+++ b/themes/default/menu-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
index ebf8acaa3..8a19e1af6 100644
--- a/themes/default/menu-inactive.svg
+++ b/themes/default/menu-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/menu-prelight.svg b/themes/default/menu-prelight.svg
index 626275364..51d4d00b3 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/default/menu-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
index d8ed0fe13..e689ac484 100644
--- a/themes/default/menu-pressed.svg
+++ b/themes/default/menu-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
index 2c1789fbd..8e19f5720 100644
--- a/themes/default/right-active.svg
+++ b/themes/default/right-active.svg
@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4"
+   width="1"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
@@ -55,21 +55,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 2.5,0 L 2.5,24"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 3.5,0 L 3.5,24"
+       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
 </svg>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 0b2a77701..edb5260a7 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"4 24 3 1",
+"1 24 3 1",
 "   c None",
 "#  c #C0C0C0 s active_color_2",
 "@  c #C0C0FF s active_color_1",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@"};
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@"};
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
index f57423d57..d6630db6d 100644
--- a/themes/default/right-inactive.svg
+++ b/themes/default/right-inactive.svg
@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4"
+   width="1"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
@@ -55,21 +55,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     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"
-       d="M 2.5,0 L 2.5,24"
-       id="path6061" />
-  </g>
-  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 3.5,0 L 3.5,24"
+       style="fill:none;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>
 </svg>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 4d7f63eeb..7580bed91 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"4 24 3 1",
+"1 24 3 1",
 "   c None",
 "#  c #C0C0C0 s inactive_color_2",
 "@  c #C0C0FF s inactive_color_1",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@",
-"##@@"};
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@",
+"@"};
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
index 012d4970e..43cfa2e91 100644
--- a/themes/default/shade-active.svg
+++ b/themes/default/shade-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 162dbcdae..053b6e2eb 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -6,7 +6,7 @@ static char * shade_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
index 2e53969b2..85abc2a09 100644
--- a/themes/default/shade-inactive.svg
+++ b/themes/default/shade-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -198,7 +198,7 @@
        transform="translate(3,6)">
       <path
          id="path2420"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
          d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
     </g>
   </g>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index fa799d03c..39f913e62 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -6,7 +6,7 @@ static char * shade_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
index a2b2e9092..bf025c46f 100644
--- a/themes/default/shade-prelight.svg
+++ b/themes/default/shade-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
index 162dbcdae..053b6e2eb 100644
--- a/themes/default/shade-prelight.xpm
+++ b/themes/default/shade-prelight.xpm
@@ -6,7 +6,7 @@ static char * shade_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-pressed.svg b/themes/default/shade-pressed.svg
index 029f2e374..91f3108ff 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/default/shade-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 162dbcdae..053b6e2eb 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -6,7 +6,7 @@ static char * shade_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
index 5f85e3b77..816173517 100644
--- a/themes/default/shade-toggled-active.svg
+++ b/themes/default/shade-toggled-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index e187d8480..2f5bc425a 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -6,7 +6,7 @@ static char * shade_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
index f5a4ea6ae..71930f638 100644
--- a/themes/default/shade-toggled-inactive.svg
+++ b/themes/default/shade-toggled-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -198,7 +198,7 @@
        transform="translate(3,6)">
       <path
          id="path2420"
-         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
          d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
     </g>
   </g>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 049fa0ee1..d0804ebd8 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -6,7 +6,7 @@ static char * shade_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_toggled_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
index c204f6ea7..f27037871 100644
--- a/themes/default/shade-toggled-prelight.svg
+++ b/themes/default/shade-toggled-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
index e187d8480..2f5bc425a 100644
--- a/themes/default/shade-toggled-prelight.xpm
+++ b/themes/default/shade-toggled-prelight.xpm
@@ -6,7 +6,7 @@ static char * shade_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
index 834b37634..4a11aae03 100644
--- a/themes/default/shade-toggled-pressed.svg
+++ b/themes/default/shade-toggled-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index e187d8480..2f5bc425a 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -6,7 +6,7 @@ static char * shade_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * shade_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
index 1c5110d47..4dc8429c7 100644
--- a/themes/default/stick-active.svg
+++ b/themes/default/stick-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 75cb69ed3..0a4304340 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -6,7 +6,7 @@ static char * stick_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
index c5139da73..3c96c5b5b 100644
--- a/themes/default/stick-inactive.svg
+++ b/themes/default/stick-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -199,7 +199,7 @@
       <path
          id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 07b104e8e..99f9fc13e 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -6,7 +6,7 @@ static char * stick_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
index 87a3c337a..cd08a10d5 100644
--- a/themes/default/stick-prelight.svg
+++ b/themes/default/stick-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
index 75cb69ed3..0a4304340 100644
--- a/themes/default/stick-prelight.xpm
+++ b/themes/default/stick-prelight.xpm
@@ -6,7 +6,7 @@ static char * stick_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
index f9d1f0bb6..25dc85123 100644
--- a/themes/default/stick-pressed.svg
+++ b/themes/default/stick-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 75cb69ed3..0a4304340 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -6,7 +6,7 @@ static char * stick_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
index 0aa7571b8..3678028c4 100644
--- a/themes/default/stick-toggled-active.svg
+++ b/themes/default/stick-toggled-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index d543d80f8..8edb6d8bc 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -6,7 +6,7 @@ static char * stick_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
index 47bb3cb10..6c1dc52ac 100644
--- a/themes/default/stick-toggled-inactive.svg
+++ b/themes/default/stick-toggled-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path29" />
   </g>
@@ -194,7 +194,7 @@
      id="g22"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path24" />
   </g>
@@ -209,11 +209,11 @@
       <path
          id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          d="M 7 6 A 1 1 0 1 1  5,6 A 1 1 0 1 1  7 6 z"
          id="path2202"
-         style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="opacity:0.50;fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 0220b1401..988419543 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -6,7 +6,7 @@ static char * stick_toggled_inactive_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_toggled_inactive_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
index 458370791..58c58b244 100644
--- a/themes/default/stick-toggled-prelight.svg
+++ b/themes/default/stick-toggled-prelight.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
index d543d80f8..8edb6d8bc 100644
--- a/themes/default/stick-toggled-prelight.xpm
+++ b/themes/default/stick-toggled-prelight.xpm
@@ -6,7 +6,7 @@ static char * stick_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
index 4227325f4..5a6f60595 100644
--- a/themes/default/stick-toggled-pressed.svg
+++ b/themes/default/stick-toggled-pressed.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="g24"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 17.5,0.5"
        id="path6059" />
   </g>
@@ -162,10 +162,10 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,3)">
+       transform="translate(0,4)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
-         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,12.5 17.5,12.5 C 17.5,12.5 17.5,15.5 14.5,15.5 C 11.5,15.5 3.5,15.5 3.5,15.5 C 3.5,15.5 0.5,15.5 0.5,12.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
          id="path4123" />
     </g>
   </g>
@@ -178,9 +178,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -198,7 +198,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 18,1.5"
        id="path32" />
   </g>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index d543d80f8..8edb6d8bc 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -6,7 +6,7 @@ static char * stick_toggled_active_xpm[] = {
 "                  ",
 "                  ",
 "                  ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 " @@@@@@@@@@@@@@@@ ",
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
@@ -23,5 +23,5 @@ static char * stick_toggled_active_xpm[] = {
 "@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@@ ",
-"  @@@@@@@@@@@@@@  ",
+"                  ",
 "                  "};
diff --git a/themes/default/themerc b/themes/default/themerc
index 1888a1960..800f0b007 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
 active_text_color=#ffffff
-button_offset=0
+button_offset=5
 button_spacing=0
 full_width_title=false
 maximized_offset=0
@@ -8,8 +8,8 @@ shadow_delta_width=1
 shadow_delta_x=1
 shadow_delta_y=1
 show_app_icon=true
-title_horizontal_offset=1
+title_horizontal_offset=4
 title_shadow_active=frame
 title_shadow_inactive=false
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2
diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg
index a17822689..1818f22e0 100644
--- a/themes/default/title-1-active.svg
+++ b/themes/default/title-1-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg
index da36099c3..f93ea8625 100644
--- a/themes/default/title-1-inactive.svg
+++ b/themes/default/title-1-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg
index 95eada3fe..0c41c4119 100644
--- a/themes/default/title-2-active.svg
+++ b/themes/default/title-2-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg
index fd47be3ec..f7699e1e8 100644
--- a/themes/default/title-2-inactive.svg
+++ b/themes/default/title-2-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg
index 6cbe066e0..d29296f08 100644
--- a/themes/default/title-3-active.svg
+++ b/themes/default/title-3-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg
index ccd8725b4..4fe0e62c9 100644
--- a/themes/default/title-3-inactive.svg
+++ b/themes/default/title-3-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg
index 500d427bf..749a491e8 100644
--- a/themes/default/title-4-active.svg
+++ b/themes/default/title-4-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg
index b9d87cb00..9b19bf421 100644
--- a/themes/default/title-4-inactive.svg
+++ b/themes/default/title-4-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg
index 87dd8fa27..9085a7d61 100644
--- a/themes/default/title-5-active.svg
+++ b/themes/default/title-5-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg
index 7904a6f51..bdeb14ecb 100644
--- a/themes/default/title-5-inactive.svg
+++ b/themes/default/title-5-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -151,7 +151,7 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#a0a0a0;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
        d="M 0.5,0.5 L 7.5,0.5"
        id="path6059" />
   </g>
@@ -164,9 +164,9 @@
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
-       height="20"
+       height="21"
        x="0"
-       y="2" />
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -184,7 +184,7 @@
        x="0"
        y="12" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
        d="M 0,1.5 L 8,1.5"
        id="path29" />
   </g>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 7387c09e1..e1991bcfc 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -25,28 +25,3 @@ static char * title_inactive_xpm[] = {
 "@@@@",
 "@@@@",
 "@@@@"};
-"4 22 2 1",
-"   c None",
-"@  c #C0C0FF s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg
index ee20d3435..7c3097352 100644
--- a/themes/default/top-left-active.svg
+++ b/themes/default/top-left-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -152,8 +152,8 @@
      inkscape:label="Border">
     <path
        id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:#000000;fill-opacity:0.25" />
+       d="M 8,0 8,1 5,1 C 5,1 1,2 1,7 1,23 1,22 1,22 L 0,22 0,0 z"
+       style="fill:#a0a0a0;fill-opacity:0.25" />
   </g>
   <g
      style="display:inline"
@@ -163,7 +163,7 @@
     <path
        id="path6057"
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,2 L 4,2 C 3,2 2,2 2,5 C 2,8.5 2,12 2,22 L 8,22 L 8,22 L 8,2 z " />
+      d="M 8,1 7,1 C 6,1 1,1 1,7 c 0,3 0,5 0,15 l 7,0 0,0 z" />
   </g>
   <g
      inkscape:label="hilight"
@@ -171,15 +171,15 @@
      inkscape:groupmode="layer">
     <path
        id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 3,1 3,5 C 3,5 3.75,5 3.75,5 L 8,4 L 8,4 z "
+       d="M 8,1 6,1 C 6,1 3,1 3,5 l 1,0 4,0 0,0 z"
        style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2,12 L 8,12 L 8,22 L 4,22 L 2,12 z"
+       d="m 2,12 6,0 0,10 -6,0 z"
        id="path2396" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,21.5 1.5,21.5 L 1.5,21.5 L 1.5,21.5"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+       d="m 8,1.5 -3,0 c 0,0 -3.5,0 -3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
        id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 58193af45..c5cc6c41f 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -3,7 +3,8 @@ static char * top_left_active_xpm[] = {
 "8 22 2 1",
 "   c None",
 "@  c #C0C0FF s active_color_1",
-"   @@@@@",
+"    @@@@",
+"  @@@@@@",
 " @@@@@@@",
 " @@@@@@@",
 "@@@@@@@@",
@@ -23,5 +24,4 @@ static char * top_left_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg
index f8c17ecd5..f5c6d9dff 100644
--- a/themes/default/top-left-inactive.svg
+++ b/themes/default/top-left-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -152,8 +152,8 @@
      inkscape:label="Border">
     <path
        id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:#000000;fill-opacity:0.25" />
+       d="M 8,0 8,1 5,1 C 5,1 1,2 1,7 1,23 1,22 1,22 L 0,22 0,0 z"
+       style="fill:#a0a0a0;fill-opacity:0.25" />
   </g>
   <g
      style="display:inline"
@@ -163,7 +163,7 @@
     <path
        id="path6057"
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,2 L 4,2 C 3,2 2,2 2,5 C 2,8.5 2,12 2,22 L 8,22 L 8,22 L 8,2 z " />
+       d="M 8,1 7,1 C 6,1 1,1 1,7 c 0,3 0,5 0,15 l 7,0 0,0 z" />
   </g>
   <g
      inkscape:label="hilight"
@@ -171,15 +171,15 @@
      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 "
+       d="M 8,1 6,1 C 6,1 3,1 3,5 l 1,0 4,0 0,0 z"
        style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2,12 L 8,12 L 8,22 L 4,22 L 2,12 z"
+       d="m 2,12 6,0 0,10 -6,0 z"
        id="path2396" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,21.5 1.5,21.5 L 1.5,21.5 L 1.5,21.5"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+       d="m 8,1.5 -3,0 c 0,0 -3.5,0 -3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
        id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 29435a0a5..57b823f7b 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -3,7 +3,8 @@ static char * top_left_inactive_xpm[] = {
 "8 22 2 1",
 "   c None",
 "@  c #C0C0FF s inactive_color_1",
-"   @@@@@",
+"    @@@@",
+"  @@@@@@",
 " @@@@@@@",
 " @@@@@@@",
 "@@@@@@@@",
@@ -23,5 +24,4 @@ static char * top_left_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg
index 6506dbae5..ce5bbbf6d 100644
--- a/themes/default/top-right-active.svg
+++ b/themes/default/top-right-active.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -152,8 +152,8 @@
      style="display:inline">
     <path
        id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:#000000;fill-opacity:0.25" />
+       d="M 0,0 0,1 3,1 C 3,1 7,2 7,7 7,23 7,22 7,22 L 8,22 8,0 z"
+       style="fill:#a0a0a0;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -162,7 +162,7 @@
      style="display:inline">
     <path
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,2 L 4,2 C 5,2 6,2 6,5 C 6,8.5 6,12 6,22 L 0,22 L 0,22 L 0,2 z "
+       d="m 0,1 1,0 c 1,0 6,0 6,6 0,3 0,5 0,15 l -7,0 0,0 z"
        id="path6057" />
   </g>
   <g
@@ -171,15 +171,15 @@
      inkscape:groupmode="layer">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 2.25,1 C 2.25,1 5,1 5,5 C 5,5 4.25,5 4.25,5 L 0,4 L 0,4 z "
+       d="M 0,1 2,1 C 2,1 5,1 5,5 L 4,5 0,5 0,5 z"
        id="path6061" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6,12 L 0,12 L 0,22 L 4,22 L 6,12 z"
+       d="m 6,12 -6,0 0,10 6,0 z"
        id="path2396" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,21.5 6.5,21.5 L 6.5,21.5 L 6.5,21.5 "
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+       d="m 0,1.5 3,0 c 0,0 3.5,0 3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
        id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index f35e2ba3e..ca7e04bb1 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -3,7 +3,8 @@ static char * top_right_active_xpm[] = {
 "8 22 2 1",
 "   c None",
 "@  c #C0C0FF s active_color_1",
-"@@@@@   ",
+"@@@@    ",
+"@@@@@@  ",
 "@@@@@@@ ",
 "@@@@@@@ ",
 "@@@@@@@@",
@@ -23,5 +24,4 @@ static char * top_right_active_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};
diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg
index 8f956d511..a6a30075c 100644
--- a/themes/default/top-right-inactive.svg
+++ b/themes/default/top-right-inactive.svg
@@ -32,51 +32,51 @@
          id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.15;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.00;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1.00;" />
+         style="stop-color:#ffffff;stop-opacity:0.75;" />
       <stop
          id="stop5851"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.20;" />
+         offset="0.75"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
       <stop
          id="stop14"
          offset="1"
-         style="stop-color:#000000;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
        id="linearGradient3148"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
-       y2="22"
+       y2="15"
        gradientUnits="userSpaceOnUse"
        spreadMethod="none" />
     <linearGradient
+       id="linearGradient5873">
+      <stop
+         id="stop5875"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.15;" />
+      <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.00;" />
+      <stop
+         id="stop5879"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient6962"
        x1="0"
-       y1="1"
+       y1="0"
        x2="0"
        y2="8"
        gradientUnits="userSpaceOnUse"
@@ -152,8 +152,8 @@
      style="display:inline">
     <path
        id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:#000000;fill-opacity:0.25" />
+       d="M 0,0 0,1 3,1 C 3,1 7,2 7,7 7,23 7,22 7,22 L 8,22 8,0 z"
+       style="fill:#a0a0a0;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -162,7 +162,7 @@
      style="display:inline">
     <path
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,2 L 4,2 C 5,2 6,2 6,5 C 6,8.5 6,12 6,22 L 0,22 L 0,22 L 0,2 z "
+       d="m 0,1 1,0 c 1,0 6,0 6,6 0,3 0,5 0,15 l -7,0 0,0 z"
        id="path6057" />
   </g>
   <g
@@ -171,15 +171,15 @@
      inkscape:groupmode="layer">
     <path
        style="fill:url(#linearGradient6962);fill-opacity:0.10;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,4 z "
+       d="M 0,1 2,1 C 2,1 5,1 5,5 L 4,5 0,5 0,5 z"
        id="path6061" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6,12 L 0,12 L 0,22 L 4,22 L 6,12 z"
+       d="m 6,12 -6,0 0,10 5,0 z"
        id="path2396" />
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,21.5 6.5,21.5 L 6.5,21.5 L 6.5,21.5 "
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.0"
+       d="m 0,1.5 3,0 c 0,0 3.5,0 3.5,4.5 0,3 0,15.5 0,15.5 l 0,0 0,0"
        id="path2170" />
   </g>
 </svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index d18fffc9d..354772321 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -3,7 +3,8 @@ static char * top_right_inactive_xpm[] = {
 "8 22 2 1",
 "   c None",
 "@  c #C0C0FF s inactive_color_1",
-"@@@@@   ",
+"@@@@    ",
+"@@@@@@  ",
 "@@@@@@@ ",
 "@@@@@@@ ",
 "@@@@@@@@",
@@ -23,5 +24,4 @@ static char * top_right_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
 "@@@@@@@@"};