Menta themes: Use high resolution window control assets

This adds higher resolution window controls and explicitly sets the
lower resolution size in the image <draw_ops>. This allows marco to
determine the intended size to be used for either LoDPI or HiDPI
rendering.

23 files changed, 392 insertions, 4443 deletions

diff --git a/desktop-themes/Menta-border/metacity-1/close_focused_normal.svg b/desktop-themes/Menta-border/metacity-1/close_focused_normal.svg
index 0fedea70..82910b90 100644
--- a/desktop-themes/Menta-border/metacity-1/close_focused_normal.svg
+++ b/desktop-themes/Menta-border/metacity-1/close_focused_normal.svg
@@ -1,213 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(98.039216%,98.039216%,98.039216%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(83.137256%,83.137256%,83.137256%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12 26.25 L 24.25 14 L 26 15.75 L 13.75 28 Z M 12 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26 26.25 L 13.75 14 L 12 15.75 L 24.25 28 Z M 26 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 12 24.25 L 24.25 12 L 26 13.75 L 13.75 26 Z M 12 24.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 26 24.25 L 13.75 12 L 12 13.75 L 24.25 26 Z M 26 24.25 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/close_focused_prelight.svg b/desktop-themes/Menta-border/metacity-1/close_focused_prelight.svg
index 30aeca52..ce7464e3 100644
--- a/desktop-themes/Menta-border/metacity-1/close_focused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/close_focused_prelight.svg
@@ -1,242 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12 26.25 L 24.25 14 L 26 15.75 L 13.75 28 Z M 12 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26 26.25 L 13.75 14 L 12 15.75 L 24.25 28 Z M 26 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 12 24.25 L 24.25 12 L 26 13.75 L 13.75 26 Z M 12 24.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 26 24.25 L 13.75 12 L 12 13.75 L 24.25 26 Z M 26 24.25 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/close_focused_pressed.svg b/desktop-themes/Menta-border/metacity-1/close_focused_pressed.svg
index 58b773c3..74a49995 100644
--- a/desktop-themes/Menta-border/metacity-1/close_focused_pressed.svg
+++ b/desktop-themes/Menta-border/metacity-1/close_focused_pressed.svg
@@ -1,212 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,-3.090909,-25.2,54.545654)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(78.431374%,78.431374%,78.431374%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 9.613281 28.390625 2 19 2 C 9.609375 2 2 9.613281 2 19 C 2 28.390625 9.609375 36 19 36 C 28.390625 36 36 28.390625 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12 26.25 L 24.25 14 L 26 15.75 L 13.75 28 Z M 12 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26 26.25 L 13.75 14 L 12 15.75 L 24.25 28 Z M 26 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 12 24.25 L 24.25 12 L 26 13.75 L 13.75 26 Z M 12 24.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 26 24.25 L 13.75 12 L 12 13.75 L 24.25 26 Z M 26 24.25 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/close_unfocused.svg b/desktop-themes/Menta-border/metacity-1/close_unfocused.svg
index ec9c30c8..bd879e92 100644
--- a/desktop-themes/Menta-border/metacity-1/close_unfocused.svg
+++ b/desktop-themes/Menta-border/metacity-1/close_unfocused.svg
@@ -1,252 +1,11 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 11.066406 24.949219 L 24.949219 11.066406 L 26.933594 13.050781 L 13.050781 26.933594 Z M 11.066406 24.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 26.933594 24.949219 L 13.050781 11.066406 L 11.066406 13.050781 L 24.949219 26.933594 Z M 26.933594 24.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196079%,90.196079%,90.196079%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 12 24.25 L 24.25 12 L 26 13.75 L 13.75 26 Z M 12 24.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 26 24.25 L 13.75 12 L 12 13.75 L 24.25 26 Z M 26 24.25 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/close_unfocused_prelight.svg b/desktop-themes/Menta-border/metacity-1/close_unfocused_prelight.svg
index 5c3dd268..613129f6 100644
--- a/desktop-themes/Menta-border/metacity-1/close_unfocused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/close_unfocused_prelight.svg
@@ -1,207 +1,11 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 11.066406 24.949219 L 24.949219 11.066406 L 26.933594 13.050781 L 13.050781 26.933594 Z M 11.066406 24.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 26.933594 24.949219 L 13.050781 11.066406 L 11.066406 13.050781 L 24.949219 26.933594 Z M 26.933594 24.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 12 24.25 L 24.25 12 L 26 13.75 L 13.75 26 Z M 12 24.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 26 24.25 L 13.75 12 L 12 13.75 L 24.25 26 Z M 26 24.25 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/maximize_focused_normal.svg b/desktop-themes/Menta-border/metacity-1/maximize_focused_normal.svg
index 227116f7..fdac8415 100644
--- a/desktop-themes/Menta-border/metacity-1/maximize_focused_normal.svg
+++ b/desktop-themes/Menta-border/metacity-1/maximize_focused_normal.svg
@@ -1,212 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(98.039216%,98.039216%,98.039216%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(83.137256%,83.137256%,83.137256%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/maximize_focused_prelight.svg b/desktop-themes/Menta-border/metacity-1/maximize_focused_prelight.svg
index 05d36ff4..a32dda15 100644
--- a/desktop-themes/Menta-border/metacity-1/maximize_focused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/maximize_focused_prelight.svg
@@ -1,212 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/maximize_focused_pressed.svg b/desktop-themes/Menta-border/metacity-1/maximize_focused_pressed.svg
index 58183207..bd64a16e 100644
--- a/desktop-themes/Menta-border/metacity-1/maximize_focused_pressed.svg
+++ b/desktop-themes/Menta-border/metacity-1/maximize_focused_pressed.svg
@@ -1,211 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,-3.090909,-25.2,54.545654)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(78.431374%,78.431374%,78.431374%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 9.613281 28.390625 2 19 2 C 9.609375 2 2 9.613281 2 19 C 2 28.390625 9.609375 36 19 36 C 28.390625 36 36 28.390625 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/maximize_unfocused.svg b/desktop-themes/Menta-border/metacity-1/maximize_unfocused.svg
index 2cc9b555..bf6911b4 100644
--- a/desktop-themes/Menta-border/metacity-1/maximize_unfocused.svg
+++ b/desktop-themes/Menta-border/metacity-1/maximize_unfocused.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196079%,90.196079%,90.196079%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/maximize_unfocused_prelight.svg b/desktop-themes/Menta-border/metacity-1/maximize_unfocused_prelight.svg
index f056e9b6..aea31f62 100644
--- a/desktop-themes/Menta-border/metacity-1/maximize_unfocused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/maximize_unfocused_prelight.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/menu.png b/desktop-themes/Menta-border/metacity-1/menu.png
index b35c0828..4756fe47 100644
--- a/desktop-themes/Menta-border/metacity-1/menu.png
+++ b/desktop-themes/Menta-border/metacity-1/menu.png
diff --git a/desktop-themes/Menta-border/metacity-1/menu_prelight.png b/desktop-themes/Menta-border/metacity-1/menu_prelight.png
index 0713ddc7..d9464130 100644
--- a/desktop-themes/Menta-border/metacity-1/menu_prelight.png
+++ b/desktop-themes/Menta-border/metacity-1/menu_prelight.png
diff --git a/desktop-themes/Menta-border/metacity-1/metacity-theme-3.xml b/desktop-themes/Menta-border/metacity-1/metacity-theme-3.xml
index fdb4f364..f2d95df6 100644
--- a/desktop-themes/Menta-border/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/Menta-border/metacity-1/metacity-theme-3.xml
@@ -265,7 +265,7 @@
 <!-- button icons-->
 
 <draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_focused">
@@ -273,15 +273,15 @@
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
@@ -289,7 +289,7 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
@@ -297,7 +297,7 @@
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
@@ -305,7 +305,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused">
@@ -313,15 +313,15 @@
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
@@ -329,7 +329,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
@@ -337,7 +337,7 @@
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
@@ -345,7 +345,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused">
@@ -353,15 +353,15 @@
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
@@ -369,7 +369,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
@@ -377,7 +377,7 @@
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="19" height="19"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
@@ -385,7 +385,7 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_focused">
@@ -393,15 +393,15 @@
 </draw_ops>
 
 <draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu_prelight.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu_prelight.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_unfocused">
@@ -409,7 +409,7 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu_prelight.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_unfocused_prelight">
@@ -417,7 +417,7 @@
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+	<image filename="menu_prelight.png" x="0" y="1" width="24" height="24"/>
 </draw_ops>
 
 <draw_ops name="menu_unfocused_pressed">
diff --git a/desktop-themes/Menta-border/metacity-1/minimize_focused_normal.svg b/desktop-themes/Menta-border/metacity-1/minimize_focused_normal.svg
index 226df060..c1915a67 100644
--- a/desktop-themes/Menta-border/metacity-1/minimize_focused_normal.svg
+++ b/desktop-themes/Menta-border/metacity-1/minimize_focused_normal.svg
@@ -1,211 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(98.039216%,98.039216%,98.039216%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(83.137256%,83.137256%,83.137256%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 23.660156 L 24.320312 16.589844 L 26.070312 18.339844 L 19 25.410156 Z M 17.25 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 23.660156 L 13.679688 16.589844 L 11.929688 18.339844 L 19 25.410156 Z M 20.75 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 21.660156 L 24.320312 14.589844 L 26.070312 16.339844 L 19 23.410156 Z M 17.25 21.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 21.660156 L 13.679688 14.589844 L 11.929688 16.339844 L 19 23.410156 Z M 20.75 21.660156 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/minimize_focused_prelight.svg b/desktop-themes/Menta-border/metacity-1/minimize_focused_prelight.svg
index 39fc43ec..4f5afe05 100644
--- a/desktop-themes/Menta-border/metacity-1/minimize_focused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/minimize_focused_prelight.svg
@@ -1,211 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 23.660156 L 24.320312 16.589844 L 26.070312 18.339844 L 19 25.410156 Z M 17.25 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 23.660156 L 13.679688 16.589844 L 11.929688 18.339844 L 19 25.410156 Z M 20.75 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 21.660156 L 24.320312 14.589844 L 26.070312 16.339844 L 19 23.410156 Z M 17.25 21.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 21.660156 L 13.679688 14.589844 L 11.929688 16.339844 L 19 23.410156 Z M 20.75 21.660156 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/minimize_focused_pressed.svg b/desktop-themes/Menta-border/metacity-1/minimize_focused_pressed.svg
index b4e5629e..5f02a22d 100644
--- a/desktop-themes/Menta-border/metacity-1/minimize_focused_pressed.svg
+++ b/desktop-themes/Menta-border/metacity-1/minimize_focused_pressed.svg
@@ -1,211 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,-3.090909,-25.2,54.545654)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(78.431374%,78.431374%,78.431374%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 9.613281 28.390625 2 19 2 C 9.609375 2 2 9.613281 2 19 C 2 28.390625 9.609375 36 19 36 C 28.390625 36 36 28.390625 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 23.660156 L 24.320312 16.589844 L 26.070312 18.339844 L 19 25.410156 Z M 17.25 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 23.660156 L 13.679688 16.589844 L 11.929688 18.339844 L 19 25.410156 Z M 20.75 23.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 21.660156 L 24.320312 14.589844 L 26.070312 16.339844 L 19 23.410156 Z M 17.25 21.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 21.660156 L 13.679688 14.589844 L 11.929688 16.339844 L 19 23.410156 Z M 20.75 21.660156 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/minimize_unfocused.svg b/desktop-themes/Menta-border/metacity-1/minimize_unfocused.svg
index 90b134ef..7ebff449 100644
--- a/desktop-themes/Menta-border/metacity-1/minimize_unfocused.svg
+++ b/desktop-themes/Menta-border/metacity-1/minimize_unfocused.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196079%,90.196079%,90.196079%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 21.660156 L 24.320312 14.589844 L 26.070312 16.339844 L 19 23.410156 Z M 17.25 21.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 21.660156 L 13.679688 14.589844 L 11.929688 16.339844 L 19 23.410156 Z M 20.75 21.660156 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/minimize_unfocused_prelight.svg b/desktop-themes/Menta-border/metacity-1/minimize_unfocused_prelight.svg
index d645f34b..a5a0150f 100644
--- a/desktop-themes/Menta-border/metacity-1/minimize_unfocused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/minimize_unfocused_prelight.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 21.660156 L 24.320312 14.589844 L 26.070312 16.339844 L 19 23.410156 Z M 17.25 21.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 21.660156 L 13.679688 14.589844 L 11.929688 16.339844 L 19 23.410156 Z M 20.75 21.660156 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_normal.svg b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_normal.svg
index 2a413808..fdac8415 100644
--- a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_normal.svg
+++ b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_normal.svg
@@ -1,212 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(98.039216%,98.039216%,98.039216%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(83.137256%,83.137256%,83.137256%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_prelight.svg b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_prelight.svg
index 641fc43c..a32dda15 100644
--- a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_prelight.svg
@@ -1,212 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,3.090909,-25.2,-16.54541)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_pressed.svg b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_pressed.svg
index cb100808..bd64a16e 100644
--- a/desktop-themes/Menta-border/metacity-1/unmaximize_focused_pressed.svg
+++ b/desktop-themes/Menta-border/metacity-1/unmaximize_focused_pressed.svg
@@ -1,211 +1,26 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13" y1="4" x2="13" y2="19" gradientTransform="matrix(2.533333,0,0,2.533333,-12.666667,-10.133301)">
+<stop offset="0" style="stop-color:rgb(74.509805%,74.509805%,74.509805%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.196079%,90.196079%,90.196079%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="14.470589" y1="16.999983" x2="14.470589" y2="5.999982" gradientTransform="matrix(3.4,0,0,-3.090909,-25.2,54.545654)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.227451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="13.333333" y1="5.999987" x2="13.333333" y2="16.999987" gradientTransform="matrix(3,0,0,2.727273,-19.999999,-12.363525)">
+<stop offset="0" style="stop-color:rgb(78.431374%,78.431374%,78.431374%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(90.980393%,90.980393%,90.980393%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 38 19 C 38 29.492188 29.492188 38 19 38 C 8.507812 38 0 29.492188 0 19 C 0 8.507812 8.507812 0 19 0 C 29.492188 0 38 8.507812 38 19 Z M 38 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 36 19 C 36 9.613281 28.390625 2 19 2 C 9.609375 2 2 9.613281 2 19 C 2 28.390625 9.609375 36 19 36 C 28.390625 36 36 28.390625 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.25 18.339844 L 24.320312 25.410156 L 26.070312 23.660156 L 19 16.589844 Z M 17.25 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.75 18.339844 L 13.679688 25.410156 L 11.929688 23.660156 L 19 16.589844 Z M 20.75 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(30.19608%,30.19608%,30.19608%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused.svg b/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused.svg
index 190fa59b..bf6911b4 100644
--- a/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused.svg
+++ b/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196079%,90.196079%,90.196079%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>
diff --git a/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused_prelight.svg b/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused_prelight.svg
index 3856a573..aea31f62 100644
--- a/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused_prelight.svg
+++ b/desktop-themes/Menta-border/metacity-1/unmaximize_unfocused_prelight.svg
@@ -1,235 +1,9 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" viewBox="0 0 38 38" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.19608%,70.19608%,70.19608%);fill-opacity:1;" d="M 36 19 C 36 28.390625 28.390625 36 19 36 C 9.609375 36 2 28.390625 2 19 C 2 9.609375 9.609375 2 19 2 C 28.390625 2 36 9.609375 36 19 Z M 36 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 34 19 C 34 27.285156 27.285156 34 19 34 C 10.714844 34 4 27.285156 4 19 C 4 10.714844 10.714844 4 19 4 C 27.285156 4 34 10.714844 34 19 Z M 34 19 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 17.25 16.339844 L 24.320312 23.410156 L 26.070312 21.660156 L 19 14.589844 Z M 17.25 16.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.000001%,40.000001%,40.000001%);fill-opacity:1;" d="M 20.75 16.339844 L 13.679688 23.410156 L 11.929688 21.660156 L 19 14.589844 Z M 20.75 16.339844 "/>
+</g>
 </svg>