update Menta GTK-3, metacity, gnome-shell, xfwm4 to latest Zukwito update from 2013.03.29

43 files changed, 4535 insertions, 91 deletions

diff --git a/desktop-themes/Menta/metacity-1/Makefile.am b/desktop-themes/Menta/metacity-1/Makefile.am
index 5d7e3355..437b0343 100644
--- a/desktop-themes/Menta/metacity-1/Makefile.am
+++ b/desktop-themes/Menta/metacity-1/Makefile.am
@@ -2,32 +2,32 @@
 themedir = $(datadir)/themes/Menta/metacity-1
 
 theme_DATA = \
-	close_focused_normal.png \
-	close_focused_prelight.png \
-	close_focused_pressed.png \
-	close_unfocused.png \
-	close_unfocused_prelight.png \
-	maximize_focused_normal.png \
-	maximize_focused_prelight.png \
-	maximize_focused_pressed.png \
-	maximize_unfocused.png \
-	maximize_unfocused_prelight.png \
+	close_focused_normal.svg \
+	close_focused_prelight.svg \
+	close_focused_pressed.svg \
+	close_unfocused_prelight.svg \
+	close_unfocused.svg \
+	maximize_focused_normal.svg \
+	maximize_focused_prelight.svg \
+	maximize_focused_pressed.svg \
+	maximize_unfocused_prelight.svg \
+	maximize_unfocused.svg \
 	menu.png \
 	menu_prelight.png \
 	metacity-theme-1.xml \
 	metacity-theme-3.xml \
-	minimize_focused_normal.png \
-	minimize_focused_prelight.png \
-	minimize_focused_pressed.png \
-	minimize_unfocused.png \
-	minimize_unfocused_prelight.png \
+	minimize_focused_normal.svg \
+	minimize_focused_prelight.svg \
+	minimize_focused_pressed.svg \
+	minimize_unfocused_prelight.svg \
+	minimize_unfocused.svg \
 	trough_left.png \
 	trough_middle.png \
 	trough_right.png \
-	unmaximize_focused_normal.png \
-	unmaximize_focused_prelight.png \
-	unmaximize_focused_pressed.png \
-	unmaximize_unfocused.png \
-	unmaximize_unfocused_prelight.png
+	unmaximize_focused_normal.svg \
+	unmaximize_focused_prelight.svg \
+	unmaximize_focused_pressed.svg \
+	unmaximize_unfocused_prelight.svg \
+	unmaximize_unfocused.svg
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/Menta/metacity-1/close_focused_normal.png b/desktop-themes/Menta/metacity-1/close_focused_normal.png
deleted file mode 100644
index 5d148544..00000000
--- a/desktop-themes/Menta/metacity-1/close_focused_normal.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/close_focused_normal.svg b/desktop-themes/Menta/metacity-1/close_focused_normal.svg
new file mode 100644
index 00000000..0fedea70
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/close_focused_normal.svg
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_focused_normal.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.7860737"
+     inkscape:cy="10.751169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="34"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4083">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4087"
+         transform="translate(0,-4.762396e-6)">
+        <g
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
+           style="fill:#ffffff"
+           id="g4081">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4083"
+             width="7"
+             height="1"
+             x="-730.66187"
+             y="743.63245"
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+          <rect
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
+             y="726.66187"
+             x="-747.63245"
+             height="1"
+             width="7"
+             id="rect4085"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3960"
+           style="fill:#4d4d4d"
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
+          <rect
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+             y="743.63245"
+             x="-730.66187"
+             height="1"
+             width="7"
+             id="rect3956"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3958"
+             width="7"
+             height="1"
+             x="-747.63245"
+             y="726.66187"
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/close_focused_prelight.png b/desktop-themes/Menta/metacity-1/close_focused_prelight.png
deleted file mode 100644
index f1fea206..00000000
--- a/desktop-themes/Menta/metacity-1/close_focused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/close_focused_prelight.svg b/desktop-themes/Menta/metacity-1/close_focused_prelight.svg
new file mode 100644
index 00000000..30aeca52
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/close_focused_prelight.svg
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_focused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767-3"
+       id="linearGradient3797-4"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       id="linearGradient3767-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3769-5" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771-1" />
+    </linearGradient>
+    <linearGradient
+       y2="16.999987"
+       x2="13.333333"
+       y1="5.9999866"
+       x1="13.333333"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4168"
+       xlink:href="#linearGradient3767-3"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.8485737"
+     inkscape:cy="10.751169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="34"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4197">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765-5"
+         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4087"
+         transform="translate(0,-4.762396e-6)">
+        <g
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
+           style="fill:#ffffff"
+           id="g4081">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4083"
+             width="7"
+             height="1"
+             x="-730.66187"
+             y="743.63245"
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+          <rect
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
+             y="726.66187"
+             x="-747.63245"
+             height="1"
+             width="7"
+             id="rect4085"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3960"
+           style="fill:#4d4d4d"
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
+          <rect
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+             y="743.63245"
+             x="-730.66187"
+             height="1"
+             width="7"
+             id="rect3956"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3958"
+             width="7"
+             height="1"
+             x="-747.63245"
+             y="726.66187"
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/close_focused_pressed.png b/desktop-themes/Menta/metacity-1/close_focused_pressed.png
deleted file mode 100644
index 698118b4..00000000
--- a/desktop-themes/Menta/metacity-1/close_focused_pressed.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/close_focused_pressed.svg b/desktop-themes/Menta/metacity-1/close_focused_pressed.svg
new file mode 100644
index 00000000..58b773c3
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/close_focused_pressed.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_focused_pressed.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="1.7785883"
+     inkscape:cy="11.819935"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="60"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4399">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4087">
+        <g
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
+           style="fill:#ffffff"
+           id="g4081">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4083"
+             width="7"
+             height="1"
+             x="-730.66187"
+             y="743.63245"
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+          <rect
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
+             y="726.66187"
+             x="-747.63245"
+             height="1"
+             width="7"
+             id="rect4085"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3960"
+           style="fill:#4d4d4d"
+           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
+          <rect
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+             y="743.63245"
+             x="-730.66187"
+             height="1"
+             width="7"
+             id="rect3956"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3958"
+             width="7"
+             height="1"
+             x="-747.63245"
+             y="726.66187"
+             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/close_unfocused.png b/desktop-themes/Menta/metacity-1/close_unfocused.png
deleted file mode 100644
index f3bf3550..00000000
--- a/desktop-themes/Menta/metacity-1/close_unfocused.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/close_unfocused.svg b/desktop-themes/Menta/metacity-1/close_unfocused.svg
new file mode 100644
index 00000000..ec9c30c8
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/close_unfocused.svg
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_unfocused.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="8.8760382"
+     inkscape:cy="12.713832"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g4580"
+       transform="translate(-1.9999997,1.9999733)">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
+      <g
+         id="g4005"
+         style="fill:#b3b3b3"
+         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="743.63245"
+           x="-730.66187"
+           height="1"
+           width="7"
+           id="rect4007"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+           id="rect4009"
+           width="7"
+           height="1"
+           x="-747.63245"
+           y="726.66187"
+           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+      </g>
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <rect
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+         y="743.51373"
+         x="-732.20001"
+         height="1.2374369"
+         width="8.6620579"
+         id="rect3956-1"
+         style="fill:#666666;fill-opacity:1;stroke:none" />
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:none"
+         id="rect3958-6"
+         width="8.6620579"
+         height="1.2374369"
+         x="-748.4635"
+         y="727.25031"
+         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/close_unfocused_prelight.png b/desktop-themes/Menta/metacity-1/close_unfocused_prelight.png
deleted file mode 100644
index b13cea4c..00000000
--- a/desktop-themes/Menta/metacity-1/close_unfocused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/close_unfocused_prelight.svg b/desktop-themes/Menta/metacity-1/close_unfocused_prelight.svg
new file mode 100644
index 00000000..5c3dd268
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/close_unfocused_prelight.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_unfocused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="14.11663"
+     inkscape:cy="12.713832"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g4765"
+       transform="translate(-1.9999997,1.9999733)">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
+      <g
+         id="g4005"
+         style="fill:#b3b3b3"
+         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="743.63245"
+           x="-730.66187"
+           height="1"
+           width="7"
+           id="rect4007"
+           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+           id="rect4009"
+           width="7"
+           height="1"
+           x="-747.63245"
+           y="726.66187"
+           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+      </g>
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <rect
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+         y="743.51373"
+         x="-732.20001"
+         height="1.2374369"
+         width="8.6620579"
+         id="rect3956-1"
+         style="fill:#666666;fill-opacity:1;stroke:none" />
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:none"
+         id="rect3958-6"
+         width="8.6620579"
+         height="1.2374369"
+         x="-748.4635"
+         y="727.25031"
+         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_normal.png b/desktop-themes/Menta/metacity-1/maximize_focused_normal.png
deleted file mode 100644
index 5d148544..00000000
--- a/desktop-themes/Menta/metacity-1/maximize_focused_normal.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_normal.svg b/desktop-themes/Menta/metacity-1/maximize_focused_normal.svg
new file mode 100644
index 00000000..227116f7
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/maximize_focused_normal.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_normal.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="4.3842433"
+     inkscape:cy="10.751169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="34"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4304">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084"
+         transform="translate(0,4.1773256e-5)">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044-3"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040-0"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042-1"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_prelight.png b/desktop-themes/Menta/metacity-1/maximize_focused_prelight.png
deleted file mode 100644
index 3ddc5748..00000000
--- a/desktop-themes/Menta/metacity-1/maximize_focused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_prelight.svg b/desktop-themes/Menta/metacity-1/maximize_focused_prelight.svg
new file mode 100644
index 00000000..05d36ff4
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/maximize_focused_prelight.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="9.1833528"
+     inkscape:cy="9.5902743"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="698"
+     inkscape:window-x="64"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4215">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084"
+         transform="translate(0,4.1773256e-5)">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044-3"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040-8"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042-2"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_pressed.png b/desktop-themes/Menta/metacity-1/maximize_focused_pressed.png
deleted file mode 100644
index 188ec27a..00000000
--- a/desktop-themes/Menta/metacity-1/maximize_focused_pressed.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/maximize_focused_pressed.svg b/desktop-themes/Menta/metacity-1/maximize_focused_pressed.svg
new file mode 100644
index 00000000..58183207
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/maximize_focused_pressed.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_pressed.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3936"
+       gradientUnits="userSpaceOnUse"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3938"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3940"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="2.3060673"
+     inkscape:cy="12.131968"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="60"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4126">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/maximize_unfocused.png b/desktop-themes/Menta/metacity-1/maximize_unfocused.png
deleted file mode 100644
index f3bf3550..00000000
--- a/desktop-themes/Menta/metacity-1/maximize_unfocused.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/maximize_unfocused.svg b/desktop-themes/Menta/metacity-1/maximize_unfocused.svg
new file mode 100644
index 00000000..2cc9b555
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/maximize_unfocused.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_unfocused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="9.5"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g5101">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.png b/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.png
deleted file mode 100644
index 03d3a13c..00000000
--- a/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.svg b/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.svg
new file mode 100644
index 00000000..f056e9b6
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/maximize_unfocused_prelight.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="minimize_unfocused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="9.5"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g4526">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
index d6aab77d..a2589835 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
@@ -6,7 +6,7 @@
 	<author>Wolfgang Ulbrich</author>
 	<copyright>GPL</copyright>
 	<date>April 2013</date>
-	<description>Menta Metacity theme</description>
+	<description>Metacity theme</description>
 </info>
 
 <!-- General window layout -->
@@ -20,7 +20,7 @@
 	<distance name="button_height" value="24"/>
 	<distance name="title_vertical_pad" value="8"/>
 	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="frame_geometry_abnormal" title_scale="medium" rounded_top_left="false" rounded_top_right="false">
@@ -78,8 +78,7 @@
 	<!-- Background gradient -->
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
 		<color value="#e8e8e8" />
-		<color value="#e2e2e2" />
-		<color value="#dcdcdc" />
+		<color value="#d2d2d2" />
 	</gradient>
 	
 	<!-- Titlebar outline -->
@@ -107,8 +106,7 @@
 	<!-- Background gradient -->
 	<gradient type="vertical" x="0" y="0" width="width+9" height="height">
 		<color value="#e8e8e8" />
-		<color value="#e2e2e2" />
-		<color value="#dcdcdc" />
+		<color value="#d2d2d2" />
 	</gradient>
 
 	<!-- Titlebar outline -->
@@ -140,8 +138,7 @@
 	<!-- Background gradient -->
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
 		<color value="#e8e8e8" />
-		<color value="#e2e2e2" />
-		<color value="#dcdcdc" />
+		<color value="#d2d2d2" />
 	</gradient>
 	
 	<!-- Topmost dark line -->
@@ -154,8 +151,7 @@
 	<!-- Background gradient -->
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
 		<color value="#e8e8e8" />
-		<color value="#e2e2e2" />
-		<color value="#dcdcdc" />
+		<color value="#d2d2d2" />
 	</gradient>
 	
 	<!-- Topmost dark line -->
@@ -287,76 +283,76 @@
    		<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_focused_normal">
-		<image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_focused_normal.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_focused_prelight">
-		<image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_focused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_focused_pressed">
-		<image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_focused_pressed.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_unfocused_normal">
-		<image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_unfocused.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_unfocused_prelight">
-		<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="minimize_unfocused_pressed">
-		<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_focused_normal">
-		<image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_focused_normal.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_focused_prelight">
-		<image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_focused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_focused_pressed">
-		<image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_focused_pressed.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_unfocused_normal">
-		<image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_unfocused.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_unfocused_prelight">
-		<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_unfocused_pressed">
-		<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_focused_normal">
-		<image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_focused_normal.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_focused_prelight">
-		<image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_focused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_focused_pressed">
-		<image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_focused_pressed.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_unfocused_normal">
-		<image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_unfocused.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_unfocused_prelight">
-		<image filename="unmaximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="unmaximize_unfocused_pressed">
-		<image filename="unmaximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_focused_normal">
-		<image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_focused_normal.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_focused_prelight">
-		<image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_focused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_focused_pressed">
-		<image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_focused_pressed.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_unfocused_normal">
-		<image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_unfocused.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_unfocused_prelight">
-		<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="close_unfocused_pressed">
-		<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_unfocused_prelight.svg" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 
 <!-- FRAME STYLE -->
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
index 7ae906c1..b54dfdcb 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
@@ -5,19 +5,21 @@
 	<author>Wolfgang Ulbrich</author>
 	<copyright>GPL</copyright>
 	<date>April 2013</date>
-	<description>Menta Improved GNOME 3 window theme</description>
+	<description>A GNOME 3 window theme</description>
 </info>
 
 <!-- meaningfull constants -->
 
-<constant name="C_border_focused" value="blend/#000000/gtk:custom(wm_bg_b,gtk:base[NORMAL])/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:custom(wm_bg_b,gtk:base[NORMAL])/0.6" />
-<constant name="C_border_attached_focused" value="blend/#000000/gtk:custom(wm_bg_b,gtk:base[NORMAL])/0.5" />
+<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
+<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
+<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
 <constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
 <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:base[NORMAL])" />
+<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
 <constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_unfocused" value="#999999" />
+<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
+<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
+
 <!-- color of the button icons -->
 <constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
 
@@ -27,27 +29,25 @@
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
-	<distance name="title_vertical_pad" value="11"/>
-	<distance name="button_width" value="24"/>
-	<distance name="button_height" value="24"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="0"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="title_vertical_pad" value="9"/>
+	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
 	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<!-- <aspect_ratio name="button" value="1"/> -->
+	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="4"/>
 </frame_geometry>
 
 <frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
-	<distance name="title_vertical_pad" value="10"/> <!-- 
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="title_vertical_pad" value="8"/> <!-- 
 							This needs to be 1 less then the
 							title_vertical_pad on normal state
 							or you'll have bigger buttons -->
@@ -169,6 +169,10 @@
 	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
 </draw_ops>
 
+<draw_ops name="rounded_hilight_unfocused">
+	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
+</draw_ops>
+
 <draw_ops name="titlebar_focused">
 	<include name="titlebar_fill_focused" />
 	<include name="hilight" />
@@ -183,6 +187,11 @@
 	<include name="rounded_hilight" />
 </draw_ops>
 
+<draw_ops name="rounded_titlebar_unfocused">
+	<include name="titlebar_fill_unfocused" />
+	<include name="rounded_hilight_unfocused" />
+</draw_ops>
+
 <draw_ops name="rounded_titlebar_focused_alt">
 	<include name="titlebar_fill_focused" />
 	<include name="rounded_hilight" />
@@ -258,7 +267,7 @@
 
 <!-- note: negative values in x or y causes gnome-shell to crash -->
 <draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused">
@@ -266,15 +275,15 @@
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
@@ -282,7 +291,7 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
@@ -290,7 +299,7 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
@@ -298,7 +307,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused">
@@ -306,15 +315,15 @@
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
@@ -322,7 +331,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
@@ -330,7 +339,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
@@ -338,7 +347,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused">
@@ -346,15 +355,15 @@
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
@@ -362,7 +371,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
@@ -370,7 +379,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
@@ -481,7 +490,7 @@
 
 <frame_style name="normal_unfocused" geometry="normal_unfocused">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
 	<piece position="overlay" draw_ops="rounded_border_unfocused" />
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_normal.png b/desktop-themes/Menta/metacity-1/minimize_focused_normal.png
deleted file mode 100644
index 5d148544..00000000
--- a/desktop-themes/Menta/metacity-1/minimize_focused_normal.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_normal.svg b/desktop-themes/Menta/metacity-1/minimize_focused_normal.svg
new file mode 100644
index 00000000..226df060
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/minimize_focused_normal.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="minimize_focused_normal.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-5.7556119"
+     inkscape:cy="10.751169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="34"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g3971">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g3822">
+        <g
+           transform="translate(-0.83999283,2.2899698)"
+           id="g3816"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect3818"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3820"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044"
+           transform="translate(-0.83999283,1.290164)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_prelight.png b/desktop-themes/Menta/metacity-1/minimize_focused_prelight.png
deleted file mode 100644
index c3f77578..00000000
--- a/desktop-themes/Menta/metacity-1/minimize_focused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_prelight.svg b/desktop-themes/Menta/metacity-1/minimize_focused_prelight.svg
new file mode 100644
index 00000000..39fc43ec
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/minimize_focused_prelight.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="minimize_focused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-1.7283373"
+     inkscape:cy="9.5902743"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="64"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4041">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g3822">
+        <g
+           transform="translate(-0.83999283,2.2899698)"
+           id="g3816"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect3818"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3820"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044"
+           transform="translate(-0.83999283,1.290164)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_pressed.png b/desktop-themes/Menta/metacity-1/minimize_focused_pressed.png
deleted file mode 100644
index c805d18f..00000000
--- a/desktop-themes/Menta/metacity-1/minimize_focused_pressed.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/minimize_focused_pressed.svg b/desktop-themes/Menta/metacity-1/minimize_focused_pressed.svg
new file mode 100644
index 00000000..b4e5629e
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/minimize_focused_pressed.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="minimize_focused_pressed.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="2.3685673"
+     inkscape:cy="12.131968"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="60"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g3905">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g3822">
+        <g
+           transform="translate(-0.83999283,2.2899698)"
+           id="g3816"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect3818"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3820"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044"
+           transform="translate(-0.83999283,1.290164)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/minimize_unfocused.png b/desktop-themes/Menta/metacity-1/minimize_unfocused.png
deleted file mode 100644
index 07c1eb39..00000000
--- a/desktop-themes/Menta/metacity-1/minimize_unfocused.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/minimize_unfocused.svg b/desktop-themes/Menta/metacity-1/minimize_unfocused.svg
new file mode 100644
index 00000000..90b134ef
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/minimize_unfocused.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="close_unfocused.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="7.115262"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g3921">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="translate(-2.8399928,3.290164)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.png b/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.png
deleted file mode 100644
index 100efe11..00000000
--- a/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.svg b/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.svg
new file mode 100644
index 00000000..d645f34b
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/minimize_unfocused_prelight.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="minimize_unfocused.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="9.5"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g4495">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="translate(-2.8399928,3.290164)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.png b/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.png
deleted file mode 100644
index 5d148544..00000000
--- a/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.svg b/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.svg
new file mode 100644
index 00000000..2a413808
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/unmaximize_focused_normal.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_normal.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="4.3842433"
+     inkscape:cy="10.751169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="34"
+     inkscape:window-y="98"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4304">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084"
+         transform="translate(0,4.1773256e-5)">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044-3"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040-0"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042-1"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.png b/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.png
deleted file mode 100644
index 3ddc5748..00000000
--- a/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.svg b/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.svg
new file mode 100644
index 00000000..641fc43c
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/unmaximize_focused_prelight.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="9.1833528"
+     inkscape:cy="9.5902743"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="698"
+     inkscape:window-x="64"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4215">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084"
+         transform="translate(0,4.1773256e-5)">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044-3"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040-8"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042-2"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.png b/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.png
deleted file mode 100644
index 188ec27a..00000000
--- a/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.svg b/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.svg
new file mode 100644
index 00000000..cb100808
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/unmaximize_focused_pressed.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_focused_pressed.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#c8c8c8;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#e8e8e8;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3936"
+       gradientUnits="userSpaceOnUse"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3938"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3940"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="2.3060673"
+     inkscape:cy="12.131968"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="697"
+     inkscape:window-x="60"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-1.9999997px"
+       originy="-2.0000327px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.9999997,-1031.3622)">
+    <g
+       id="g4126">
+      <path
+         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
+         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="7.5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="12.5"
+         id="path2987"
+         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
+         id="path3775"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path3765"
+         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         id="g4084">
+        <g
+           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
+           id="g4078"
+           style="fill:#ffffff">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:none"
+             id="rect4080"
+             width="4.9997449"
+             height="1.2369368"
+             x="-727.92255"
+             y="744.13599"
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+          <rect
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+             y="726.68433"
+             x="-745.37366"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect4082"
+             style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        </g>
+        <g
+           id="g3044"
+           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
+          <rect
+             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
+             y="744.13599"
+             x="-727.92255"
+             height="1.2369368"
+             width="4.9997449"
+             id="rect3040"
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+          <rect
+             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+             id="rect3042"
+             width="4.9997449"
+             height="1.2369368"
+             x="-745.37366"
+             y="726.68433"
+             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_unfocused.png b/desktop-themes/Menta/metacity-1/unmaximize_unfocused.png
deleted file mode 100644
index f3bf3550..00000000
--- a/desktop-themes/Menta/metacity-1/unmaximize_unfocused.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_unfocused.svg b/desktop-themes/Menta/metacity-1/unmaximize_unfocused.svg
new file mode 100644
index 00000000..190fa59b
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/unmaximize_unfocused.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_unfocused.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="9.5"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g5101">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.png b/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 03d3a13c..00000000
--- a/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.svg b/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.svg
new file mode 100644
index 00000000..3856a573
--- /dev/null
+++ b/desktop-themes/Menta/metacity-1/unmaximize_unfocused_prelight.svg
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="maximize_unfocused_prelight.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         id="stop3779"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.22745098;" />
+      <stop
+         id="stop3781"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1;"
+         offset="0"
+         id="stop3769" />
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1;"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#bebebe;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="13"
+       y1="4"
+       x2="13"
+       y2="19"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient3797"
+       gradientUnits="userSpaceOnUse"
+       x1="13.333333"
+       y1="5.9999866"
+       x2="13.333333"
+       y2="16.999987" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="14.470589"
+       y1="16.999983"
+       x2="14.470589"
+       y2="5.9999824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4525"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4527"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4529"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4531"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4533"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.8622"
+       x2="19"
+       y2="1040.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4553"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3767"
+       id="linearGradient4571"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="5.9999866"
+       x2="14"
+       y2="16.999987" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.533758"
+     inkscape:cx="9.5"
+     inkscape:cy="11.22532"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1150"
+     inkscape:window-height="742"
+     inkscape:window-x="65"
+     inkscape:window-y="49"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1033.3622)">
+    <g
+       id="g4526">
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+         id="path4003"
+         sodipodi:cx="13"
+         sodipodi:cy="11.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5.5"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
+      <path
+         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
+         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5"
+         sodipodi:cy="11.5"
+         sodipodi:cx="13"
+         id="path4545"
+         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <g
+         style="fill:#666666"
+         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
+         id="g3044">
+        <rect
+           style="fill:#666666;fill-opacity:1;stroke:none"
+           id="rect3040"
+           width="4.9997449"
+           height="1.2369368"
+           x="-727.92255"
+           y="744.13599"
+           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
+        <rect
+           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
+           y="726.68433"
+           x="-745.37366"
+           height="1.2369368"
+           width="4.9997449"
+           id="rect3042"
+           style="fill:#666666;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>